1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
diff -ru DVDStyler-1.05.orig/Makefile.am DVDStyler-1.05/Makefile.am
--- DVDStyler-1.05.orig/Makefile.am 2004-07-20 21:14:26.000000000 +0930
+++ DVDStyler-1.05/Makefile.am 2004-08-05 08:18:54.316885328 +0930
@@ -3,7 +3,7 @@
ACLOCAL_AMFLAGS=-I.
-dist_pkgdatadir=$(prefix)
+dist_pkgdatadir=@datadir@/docs/@PACKAGE_NAME@
dist_pkgdata_DATA = silence.mp2 AUTHORS COPYING INSTALL README ChangeLog
run: all
diff -ru DVDStyler-1.05.orig/backgrounds/Makefile.am DVDStyler-1.05/backgrounds/Makefile.am
--- DVDStyler-1.05.orig/backgrounds/Makefile.am 2004-06-15 20:28:06.000000000 +0930
+++ DVDStyler-1.05/backgrounds/Makefile.am 2004-08-05 08:18:54.317885176 +0930
@@ -1,3 +1,3 @@
-dist_pkgdatadir=$(prefix)/backgrounds
+dist_pkgdatadir=@datadir@/@PACKAGE_NAME@/backgrounds
dist_pkgdata_DATA = *.jpg
diff -ru DVDStyler-1.05.orig/buttons/Makefile.am DVDStyler-1.05/buttons/Makefile.am
--- DVDStyler-1.05.orig/buttons/Makefile.am 2004-06-15 20:28:06.000000000 +0930
+++ DVDStyler-1.05/buttons/Makefile.am 2004-08-05 08:18:54.319884872 +0930
@@ -1,3 +1,3 @@
-dist_pkgdatadir=$(prefix)/buttons
+dist_pkgdatadir=@datadir@/@PACKAGE_NAME@/buttons
dist_pkgdata_DATA = *.xml
diff -ru DVDStyler-1.05.orig/configure.in DVDStyler-1.05/configure.in
--- DVDStyler-1.05.orig/configure.in 2004-06-30 04:58:59.000000000 +0930
+++ DVDStyler-1.05/configure.in 2004-08-05 08:18:54.320884720 +0930
@@ -119,7 +119,6 @@
dnl vars
orig_prefix=$prefix
-prefix=$prefix/dvdstyler
AC_SUBST(orig_prefix)
AC_SUBST(LDFLAGS)
AC_SUBST(CFLAGS)
diff -ru DVDStyler-1.05.orig/install.win32/Makefile.am DVDStyler-1.05/install.win32/Makefile.am
--- DVDStyler-1.05.orig/install.win32/Makefile.am 2004-06-11 20:36:10.000000000 +0930
+++ DVDStyler-1.05/install.win32/Makefile.am 2004-08-05 08:18:54.322884416 +0930
@@ -7,13 +7,13 @@
if USE_KDE
install-kde:
- mkdir -p $(KDE_DATA_DIR)/icons
- if test -w $(KDE_DATA_DIR)/icons ; then \
- install -m 644 $(top_srcdir)/src/rc/$(ICON) $(KDE_DATA_DIR)/icons/$(ICON); \
+ $(INSTALL) -d $(DESTDIR)$(KDE_DATA_DIR)/icons
+ if test -w $(DESTDIR)$(KDE_DATA_DIR)/icons ; then \
+ install -m 644 $(top_srcdir)/src/rc/$(ICON) $(DESTDIR)$(KDE_DATA_DIR)/icons/$(ICON); \
fi
- mkdir -p $(KDE_DATA_DIR)/applnk/Multimedia
- if test -w $(KDE_DATA_DIR)/applnk/Multimedia ; then \
- install -m 644 $(srcdir)/$(DESK) $(KDE_DATA_DIR)/applnk/Multimedia; \
+ $(INSTALL) -d $(DESTDIR)$(KDE_DATA_DIR)/applnk/Multimedia
+ if test -w $(DESTDIR)$(KDE_DATA_DIR)/applnk/Multimedia ; then \
+ install -m 644 $(srcdir)/$(DESK) $(DESTDIR)$(KDE_DATA_DIR)/applnk/Multimedia; \
fi
else
@@ -25,14 +25,14 @@
if USE_GNOME
install-gnome:
- mkdir -p $(GNOME_DATA_DIR)/pixmaps
- if test -w $(GNOME_DATA_DIR)/pixmaps ; then \
- install -m 644 $(top_srcdir)/src/rc/$(XPM) $(GNOME_DATA_DIR)/pixmaps/$(XPM); \
- install -m 644 $(top_srcdir)/src/rc/$(ICON) $(GNOME_DATA_DIR)/pixmaps/$(ICON); \
+ $(INSTALL) -d $(DESTDIR)$(GNOME_DATA_DIR)/pixmaps
+ if test -w $(DESTDIR)$(GNOME_DATA_DIR)/pixmaps ; then \
+ install -m 644 $(top_srcdir)/src/rc/$(XPM) $(DESTDIR)$(GNOME_DATA_DIR)/pixmaps/$(XPM); \
+ install -m 644 $(top_srcdir)/src/rc/$(ICON) $(DESTDIR)$(GNOME_DATA_DIR)/pixmaps/$(ICON); \
fi
- mkdir -p $(GNOME_DATA_DIR)/gnome/apps/
- if test -w $(GNOME_DATA_DIR)/gnome/apps/Multimedia ; then \
- install -m 644 $(srcdir)/$(DESK) $(GNOME_DATA_DIR)/gnome/apps/Multimedia; \
+ $(INSTALL) -d $(DESTDIR)$(GNOME_DATA_DIR)/gnome/apps/
+ if test -w $(DESTDIR)$(GNOME_DATA_DIR)/gnome/apps/Multimedia ; then \
+ install -m 644 $(srcdir)/$(DESK) $(DESTDIR)$(GNOME_DATA_DIR)/gnome/apps/Multimedia; \
fi
else
diff -ru DVDStyler-1.05.orig/locale/Makefile.in DVDStyler-1.05/locale/Makefile.in
--- DVDStyler-1.05.orig/locale/Makefile.in 2004-06-15 19:25:59.000000000 +0930
+++ DVDStyler-1.05/locale/Makefile.in 2004-08-05 08:18:54.323884264 +0930
@@ -9,7 +9,7 @@
LINGUAS=de it ru
prefix=@prefix@
-DATADIR=@prefix@
+DATADIR=@datadir@
INSTALL=@INSTALL@
all: allmo
@@ -35,13 +35,14 @@
install: allmo
linguas='$(LINGUAS)'; for lang in $$linguas ; do \
- $(INSTALL) -d $(DATADIR)/locale/$$lang/LC_MESSAGES ; \
- $(INSTALL) -m 644 $$lang/$(PROGNAME).mo $(DATADIR)/locale/$$lang/LC_MESSAGES/$(PROGNAME).mo ; \
+ $(INSTALL) -d $(DESTDIR)$(DATADIR)/locale/$$lang/LC_MESSAGES ; \
+ $(INSTALL) -m 644 $$lang/$(PROGNAME).mo \
+ $(DESTDIR)$(DATADIR)/locale/$$lang/LC_MESSAGES/$(PROGNAME).mo ; \
done
uninstall:
linguas='$(LINGUAS)'; for lang in $$linguas ; do \
- rm -f $(DATADIR)/locale/$$lang/LC_MESSAGES/$(PROGNAME).mo ; \
+ rm -f $(DESTDIR)$(DATADIR)/locale/$$lang/LC_MESSAGES/$(PROGNAME).mo ; \
done
clean:
diff -ru DVDStyler-1.05.orig/src/rc/Makefile.am DVDStyler-1.05/src/rc/Makefile.am
--- DVDStyler-1.05.orig/src/rc/Makefile.am 2004-07-04 01:42:44.000000000 +0930
+++ DVDStyler-1.05/src/rc/Makefile.am 2004-08-05 08:18:54.325883960 +0930
@@ -1,3 +1,3 @@
-dist_pkgdatadir=@bindir@/rc
+dist_pkgdatadir=@datadir@/@PACKAGE_NAME@/rc
dist_pkgdata_DATA = *.png *.cur
diff -ru DVDStyler-1.05.orig/wxXML/Makefile.am DVDStyler-1.05/wxXML/Makefile.am
--- DVDStyler-1.05.orig/wxXML/Makefile.am 2004-06-15 20:28:49.000000000 +0930
+++ DVDStyler-1.05/wxXML/Makefile.am 2004-08-05 08:19:14.593802768 +0930
@@ -1,6 +1,3 @@
-SUBDIRS = expat
-
noinst_LIBRARIES = libwxxml.a
libwxxml_a_SOURCES = xml.cpp xmlhelpr.cpp
-libwxxml_a_LIBADD = expat/xmlrole.o expat/xmltok.o expat/xmlparse.o
|
GitWeb