]>
Commit | Line | Data |
---|---|---|
20b9c862 | 1 | diff -Nru enlightenment-0.16.6/configure.in enlightenment-0.16.6.new/configure.in |
2 | --- enlightenment-0.16.6/configure.in Thu Jul 27 23:23:28 2000 | |
3 | +++ enlightenment-0.16.6.new/configure.in Wed May 30 14:08:45 2001 | |
1e13decb | 4 | @@ -31,10 +29,6 @@ |
20b9c862 | 5 | AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MICRO, "$ENLIGHTENMENT_MICRO", [Micro Version]) |
1e13decb | 6 | AC_SUBST(ENLIGHTENMENT_MICRO) |
7 | ||
8 | -AC_SUBST(ENLIGHTENMENT_ROOT) | |
9 | -AC_SUBST(ENLIGHTENMENT_BIN) | |
10 | -AC_SUBST(LOCALEDIR) | |
11 | - | |
20b9c862 | 12 | ALL_LINGUAS="de dk en_US es fr hu ko nl no ru sv pt pl pt_BR tr ja" |
1e13decb | 13 | |
20b9c862 | 14 | AC_PROG_CC |
15 | @@ -64,8 +67,6 @@ | |
1e13decb | 16 | AM_GNU_GETTEXT |
20b9c862 | 17 | AM_GNU_GETTEXT_VERSION(0.10.40) |
1e13decb | 18 | |
19 | -AC_ARG_ENABLE(fsstd, [ --enable-fsstd install files following FSSTD [default=no]], ,enable_fsstd=no) | |
20 | - | |
21 | AC_ARG_ENABLE(sound, [ --enable-sound compile with sound support [default=yes]], ,enable_sound=yes) | |
22 | ||
23 | AC_ARG_ENABLE(upgrade, [ --enable-upgrade compile with auto-upgrade support [default=yes]], ,enable_upgrade=yes) | |
20b9c862 | 24 | @@ -82,16 +74,6 @@ |
1e13decb | 25 | dnl The following test must come after AM_GNU_GETTEXT as it relies on |
26 | dnl ${DATADIRNAME} being defined. | |
27 | ||
28 | -if test "x$enable_fsstd" = "xyes"; then | |
1e13decb | 29 | - LOCALEDIR=${prefix}/${DATADIRNAME}/locale |
1e13decb | 30 | -else |
20b9c862 | 31 | - datadir=${prefix} |
32 | - exec_prefix=${prefix}/enlightenment | |
1e13decb | 33 | - LOCALEDIR=${prefix}/enlightenment/locale |
1e13decb | 34 | -fi |
20b9c862 | 35 | -ENLIGHTENMENT_ROOT=`eval echo ${datadir}/enlightenment` |
36 | -ENLIGHTENMENT_BIN=`eval echo ${bindir}` | |
1e13decb | 37 | - |
38 | if test "x$enable_sound" = "xyes"; then | |
20b9c862 | 39 | AM_PATH_ESD(0.2.17,AC_DEFINE(HAVE_LIBESD, 1, [libesd.so]),[ |
40 | echo "WARNING: Enlightenment needs a system with libesd.so (esound)" | |
41 | diff -Nru enlightenment-0.16.6/dox/Makefile.am enlightenment-0.16.6.new/dox/Makefile.am | |
42 | --- enlightenment-0.16.6/dox/Makefile.am Fri Mar 31 03:18:28 2000 | |
43 | +++ enlightenment-0.16.6.new/dox/Makefile.am Wed May 30 14:08:45 2001 | |
44 | @@ -23,9 +23,4 @@ | |
1e13decb | 45 | |
46 | INCLUDES=-I$(top_srcdir) $(IMLIB_CFLAGS) -I$(includedir) -I.. | |
47 | ||
48 | -DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\" | |
49 | - | |
1e13decb | 50 | -uninstall-local: |
51 | - for i in $(bin_PROGRAMS); do \ | |
52 | - rm -f $(exec_prefix)/bin/$$i; \ | |
53 | - done | |
54 | +DEFS=-DENLIGHTENMENT_ROOT=\"$(pkgdatadir)\" -DENLIGHTENMENT_BIN=\"$(bindir)\" | |
20b9c862 | 55 | diff -Nru enlightenment-0.16.6/dox/E-docs/Makefile.am enlightenment-0.16.6.new/dox/E-docs/Makefile.am |
56 | --- enlightenment-0.16.6/dox/E-docs/Makefile.am Fri Mar 31 03:18:28 2000 | |
57 | +++ enlightenment-0.16.6.new/dox/E-docs/Makefile.am Wed May 30 14:08:45 2001 | |
58 | @@ -1,4 +1,4 @@ | |
59 | -edocdatadir = $(ENLIGHTENMENT_ROOT)/E-docs | |
60 | +edocdatadir = $(pkgdatadir)/E-docs | |
1e13decb | 61 | |
20b9c862 | 62 | edocdata_DATA = @edocdata@ |
63 | edocdata_SCRIPTS = @edocexec@ | |
64 | diff -Nru enlightenment-0.16.6/eesh/Makefile.am enlightenment-0.16.6.new/eesh/Makefile.am | |
65 | --- enlightenment-0.16.6/eesh/Makefile.am Wed Aug 18 00:56:29 1999 | |
66 | +++ enlightenment-0.16.6.new/eesh/Makefile.am Wed May 30 14:08:45 2001 | |
67 | @@ -16,9 +16,4 @@ | |
1e13decb | 68 | |
69 | INCLUDES=-I$(top_srcdir) $(IMLIB_CFLAGS) -I$(includedir) -I.. | |
70 | ||
71 | -DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" | |
72 | - | |
1e13decb | 73 | -uninstall-local: |
74 | - for i in $(bin_PROGRAMS); do \ | |
75 | - rm -f $(exec_prefix)/bin/$$i; \ | |
76 | - done | |
77 | +DEFS= | |
20b9c862 | 78 | diff -Nru enlightenment-0.16.6/epp/Makefile.am enlightenment-0.16.6.new/epp/Makefile.am |
79 | --- enlightenment-0.16.6/epp/Makefile.am Wed Aug 18 00:56:29 1999 | |
80 | +++ enlightenment-0.16.6.new/epp/Makefile.am Wed May 30 14:08:45 2001 | |
81 | @@ -53,8 +53,3 @@ | |
1e13decb | 82 | -DTARGET_VT=11 |
83 | ||
84 | LIBS = | |
85 | - | |
1e13decb | 86 | -uninstall-local: |
87 | - for i in $(bin_PROGRAMS); do \ | |
88 | - rm -f $(exec_prefix)/bin/$$i; \ | |
89 | - done | |
20b9c862 | 90 | diff -Nru enlightenment-0.16.6/scripts/Makefile.am enlightenment-0.16.6.new/scripts/Makefile.am |
91 | --- enlightenment-0.16.6/scripts/Makefile.am Thu Oct 21 19:49:58 1999 | |
92 | +++ enlightenment-0.16.6.new/scripts/Makefile.am Wed May 30 14:10:28 2001 | |
93 | @@ -1,8 +1,8 @@ | |
1e13decb | 94 | EXTRA_DIST = e_gen_kde_menu e_gen_menu e_gen_gnome_menu e_cache_clean \ |
20b9c862 | 95 | -e_cache_query enlightenment.install.in e_gen_menu.e16_5 \ |
96 | -e_gen_menu.pl e_cache_clean.pl e_cache_query.pl | |
97 | + e_cache_query enlightenment.install.in e_gen_menu.e16_5 \ | |
98 | + e_gen_menu.pl e_cache_clean.pl e_cache_query.pl | |
99 | script_SCRIPTS = e_gen_kde_menu e_gen_menu e_gen_gnome_menu e_cache_clean \ | |
100 | -e_cache_query enlightenment.install e_gen_menu.e16_5 \ | |
101 | -e_gen_menu.pl e_cache_clean.pl e_cache_query.pl | |
102 | + e_cache_query enlightenment.install e_gen_menu.e16_5 \ | |
103 | + e_gen_menu.pl e_cache_clean.pl e_cache_query.pl | |
104 | ||
105 | -scriptdir = $(ENLIGHTENMENT_ROOT)/scripts | |
106 | +scriptdir = $(pkgdatadir)/scripts | |
107 | diff -Nru enlightenment-0.16.6/src/Makefile.am enlightenment-0.16.6.new/src/Makefile.am | |
108 | --- enlightenment-0.16.6/src/Makefile.am Tue May 23 01:59:53 2000 | |
109 | +++ enlightenment-0.16.6.new/src/Makefile.am Wed May 30 14:08:45 2001 | |
110 | @@ -106,14 +106,14 @@ | |
111 | ||
112 | INCLUDES = $(ESD_CFLAGS) $(IMLIB_CFLAGS) -I$(top_builddir) -I$(top_srcdir)/intl | |
1e13decb | 113 | |
114 | -DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\" -DLOCALEDIR=\"@LOCALEDIR@\" | |
e04dd378 | 115 | +DEFS=-DENLIGHTENMENT_ROOT=\"$(pkgdatadir)\" -DENLIGHTENMENT_BIN=\"$(bindir)\" -DLOCALEDIR=\"$(datadir)/locale\" -DCONFIGDATADIR=\"$(sysconfdir)\" |
1e13decb | 116 | |
117 | install-data-local: | |
118 | - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes; \ | |
119 | - rm -f $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/DEFAULT; \ | |
120 | + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/themes; \ | |
121 | + rm -f $(DESTDIR)$(pkgdatadir)/themes/DEFAULT; \ | |
122 | $(LN_S) \ | |
123 | BrushedMetal-Tigert \ | |
124 | - $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/DEFAULT; | |
1e13decb | 125 | + $(DESTDIR)$(pkgdatadir)/themes/DEFAULT; |
20b9c862 | 126 | |
127 | uninstall-local: | |
128 | for i in $(bin_PROGRAMS); do \ | |
129 | diff -Nru enlightenment-0.16.6/src/themes/Makefile.am enlightenment-0.16.6.new/src/themes/Makefile.am | |
130 | --- enlightenment-0.16.6/src/themes/Makefile.am Fri Mar 31 05:43:45 2000 | |
131 | +++ enlightenment-0.16.6.new/src/themes/Makefile.am Wed May 30 14:08:45 2001 | |
132 | @@ -1,6 +1,6 @@ | |
1e13decb | 133 | SUBDIRS = configs |
134 | ||
20b9c862 | 135 | -ethemedir = $(ENLIGHTENMENT_ROOT)/themes |
136 | +ethemedir = $(pkgdatadir)/themes | |
1e13decb | 137 | |
138 | EXTRA_DIST = BrushedMetal-Tigert.etheme ShinyMetal.etheme BlueSteel.etheme Ganymede.etheme BrushedMetal-Tigert.etheme.ja ShinyMetal.etheme.ja BlueSteel.etheme.ja Ganymede.etheme.ja | |
139 | ||
20b9c862 | 140 | diff -Nru enlightenment-0.16.6/src/themes/configs/Makefile.am enlightenment-0.16.6.new/src/themes/configs/Makefile.am |
141 | --- enlightenment-0.16.6/src/themes/configs/Makefile.am Fri Mar 31 05:43:46 2000 | |
142 | +++ enlightenment-0.16.6.new/src/themes/configs/Makefile.am Wed May 30 14:08:45 2001 | |
1e13decb | 143 | @@ -1,6 +1,6 @@ |
144 | SUBDIRS = pix backup | |
145 | ||
146 | -configdata_DATA = \ | |
147 | +sysconf_DATA = \ | |
148 | actionclasses.cfg \ | |
149 | backup-borders.cfg \ | |
150 | backup-colormodifiers.cfg \ | |
20b9c862 | 151 | @@ -21,20 +21,20 @@ |
1e13decb | 152 | keybindings.rh.cfg \ |
153 | menus.rh.cfg | |
154 | ||
20b9c862 | 155 | -configdatadir = $(ENLIGHTENMENT_ROOT)/config |
156 | +configdatadir = $(sysconfdir) | |
1e13decb | 157 | |
20b9c862 | 158 | TRANSLATIONS = config.ja config.pl |
159 | -EXTRA_DIST = $(configdata_DATA) $(TRANSLATIONS) | |
160 | +EXTRA_DIST = $(sysconf_DATA) $(TRANSLATIONS) | |
1e13decb | 161 | |
162 | install-data-local: | |
163 | - $(mkinstalldirs) $(DESTDIR)$(configdatadir) | |
e04dd378 | 164 | + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) |
20b9c862 | 165 | for f in $(TRANSLATIONS); do \ |
166 | gzip -d -c < $(srcdir)/$$f | \ | |
167 | - (cd $(DESTDIR)$(configdatadir); tar -xmf -) \ | |
168 | + (cd $(DESTDIR)$(sysconfdir); tar -xmf -) \ | |
169 | done | |
170 | ||
171 | uninstall-local: | |
172 | for f in $(TRANSLATIONS); do \ | |
173 | gzip -d -c < $(srcdir)/$$f | \ | |
174 | - (cd $(DESTDIR)$(configdatadir); rm -f `tar -tf -` 2>/dev/null) \ | |
175 | + (cd $(DESTDIR)$(sysconfdir); rm -f `tar -tf -` 2>/dev/null) \ | |
176 | done | |
177 | diff -Nru enlightenment-0.16.6/src/themes/configs/backup/Makefile.am enlightenment-0.16.6.new/src/themes/configs/backup/Makefile.am | |
178 | --- enlightenment-0.16.6/src/themes/configs/backup/Makefile.am Mon Aug 30 18:12:07 1999 | |
179 | +++ enlightenment-0.16.6.new/src/themes/configs/backup/Makefile.am Wed May 30 14:08:45 2001 | |
180 | @@ -1,4 +1,4 @@ | |
181 | -ebackupdir = $(ENLIGHTENMENT_ROOT)/config/backup | |
e04dd378 | 182 | +ebackupdir = $(sysconfdir)/backup |
1e13decb | 183 | |
20b9c862 | 184 | ebackup_DATA = |
1e13decb | 185 | |
20b9c862 | 186 | diff -Nru enlightenment-0.16.6/src/themes/configs/pix/Makefile.am enlightenment-0.16.6.new/src/themes/configs/pix/Makefile.am |
187 | --- enlightenment-0.16.6/src/themes/configs/pix/Makefile.am Wed Oct 6 16:55:56 1999 | |
188 | +++ enlightenment-0.16.6.new/src/themes/configs/pix/Makefile.am Wed May 30 14:08:45 2001 | |
189 | @@ -1,4 +1,4 @@ | |
190 | -epixdir = $(ENLIGHTENMENT_ROOT)/config/pix | |
e04dd378 | 191 | +epixdir = $(sysconfdir)/pix |
1e13decb | 192 | |
193 | epix_DATA = wait1.png wait2.png wait3.png wait4.png \ | |
194 | wait5.png wait6.png wait7.png wait8.png \ |