1 diff -Nru enlightenment-0.16.5/configure.in enlightenment-0.16.5.new/configure.in
2 --- enlightenment-0.16.5/configure.in Thu Jul 27 23:23:28 2000
3 +++ enlightenment-0.16.5.new/configure.in Wed May 30 14:08:45 2001
6 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
8 -AM_CONDITIONAL(FSSTD, test x$enable_fsstd = xyes)
11 dnl reasonable guesses for where stuff is installed
12 if test "x$prefix" = "xNONE"; then
14 AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MICRO, "$ENLIGHTENMENT_MICRO")
15 AC_SUBST(ENLIGHTENMENT_MICRO)
17 -AC_SUBST(ENLIGHTENMENT_ROOT)
18 -AC_SUBST(ENLIGHTENMENT_BIN)
21 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
22 AC_DEFINE_UNQUOTED(VERSION,"$VERSION")
28 -AC_ARG_ENABLE(fsstd, [ --enable-fsstd install files following FSSTD [default=no]], ,enable_fsstd=no)
30 AC_ARG_ENABLE(sound, [ --enable-sound compile with sound support [default=yes]], ,enable_sound=yes)
32 AC_ARG_ENABLE(upgrade, [ --enable-upgrade compile with auto-upgrade support [default=yes]], ,enable_upgrade=yes)
34 dnl The following test must come after AM_GNU_GETTEXT as it relies on
35 dnl ${DATADIRNAME} being defined.
37 -if test "x$enable_fsstd" = "xyes"; then
38 - ENLIGHTENMENT_ROOT=${datadir}/enlightenment
39 - ENLIGHTENMENT_BIN=${bindir}
40 - LOCALEDIR=${prefix}/${DATADIRNAME}/locale
43 - ENLIGHTENMENT_ROOT=${prefix}/enlightenment
44 - ENLIGHTENMENT_BIN=${prefix}/enlightenment/bin
45 - LOCALEDIR=${prefix}/enlightenment/locale
49 if test "x$enable_sound" = "xyes"; then
50 AM_PATH_ESD(0.2.17,AC_DEFINE(HAVE_LIBESD),[
51 echo "WARNING: Enlightenment needs a system with libesd.so (EsounD)"
54 AC_SUBST(XINERAMA_LIBS)
56 -AC_SUBST(ENLIGHTENMENT_ROOT)
57 -AC_SUBST(ENLIGHTENMENT_BIN)
59 AC_CHECK_LIB(Fridge,mass_quantities_of_bass_ale)
60 AC_CHECK_LIB(Fridge,mass_quantities_of_any_ale, , [
61 diff -Nru enlightenment-0.16.5/dox/E-docs/Makefile.am enlightenment-0.16.5.new/dox/E-docs/Makefile.am
62 --- enlightenment-0.16.5/dox/E-docs/Makefile.am Tue Mar 14 20:27:32 2000
63 +++ enlightenment-0.16.5.new/dox/E-docs/Makefile.am Wed May 30 14:08:45 2001
66 edocdatadir = $(pkgdatadir)/E-docs
68 -edocdatadir = $(prefix)/enlightenment/E-docs
71 edocdata_DATA = @edocdata@
72 edocdata_SCRIPTS = @edocexec@
73 diff -Nru enlightenment-0.16.5/dox/Makefile.am enlightenment-0.16.5.new/dox/Makefile.am
74 --- enlightenment-0.16.5/dox/Makefile.am Fri Mar 31 03:18:28 2000
75 +++ enlightenment-0.16.5.new/dox/Makefile.am Wed May 30 14:08:45 2001
78 EXTRA_DIST = ChangeLog README
82 -ENLIGHTENMENT_BIN=$(bindir)
83 -ENLIGHTENMENT_ROOT=$(pkgdatadir)
85 -ENLIGHTENMENT_BIN=$(prefix)/enlightenment/bin
86 -ENLIGHTENMENT_ROOT=$(prefix)/enlightenment
87 -bindir=$(ENLIGHTENMENT_BIN)
95 INCLUDES=-I$(top_srcdir) $(IMLIB_CFLAGS) -I$(includedir) -I..
97 -DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\"
100 -# if [ x@USE_FSSTD@ = "xno" ]; then \
101 -# ../mkinstalldirs $(exec_prefix)/bin; \
102 -# for i in $(bin_PROGRAMS); do \
103 -# rm -f $(exec_prefix)/bin/$$i; \
104 -# $(LN_S) $(bindir)/$$i $(exec_prefix)/bin/$$i; \
109 - for i in $(bin_PROGRAMS); do \
110 - rm -f $(exec_prefix)/bin/$$i; \
112 +DEFS=-DENLIGHTENMENT_ROOT=\"$(pkgdatadir)\" -DENLIGHTENMENT_BIN=\"$(bindir)\"
113 diff -Nru enlightenment-0.16.5/eesh/Makefile.am enlightenment-0.16.5.new/eesh/Makefile.am
114 --- enlightenment-0.16.5/eesh/Makefile.am Wed Aug 18 00:56:29 1999
115 +++ enlightenment-0.16.5.new/eesh/Makefile.am Wed May 30 14:08:45 2001
119 -ENLIGHTENMENT_ROOT=$(pkglibdir)
121 -bindir=$(prefix)/enlightenment/bin
122 -ENLIGHTENMENT_ROOT=$(prefix)/enlightenment
129 INCLUDES=-I$(top_srcdir) $(IMLIB_CFLAGS) -I$(includedir) -I..
131 -DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\"
133 -#install-exec-local:
134 -# if [ x@USE_FSSTD@ = "xno" ]; then \
135 -# ../mkinstalldirs $(exec_prefix)/bin; \
136 -# for i in $(bin_PROGRAMS); do \
137 -# rm -f $(exec_prefix)/bin/$$i; \
138 -# $(LN_S) $(bindir)/$$i $(exec_prefix)/bin/$$i; \
143 - for i in $(bin_PROGRAMS); do \
144 - rm -f $(exec_prefix)/bin/$$i; \
147 diff -Nru enlightenment-0.16.5/epp/Makefile.am enlightenment-0.16.5.new/epp/Makefile.am
148 --- enlightenment-0.16.5/epp/Makefile.am Wed Aug 18 00:56:29 1999
149 +++ enlightenment-0.16.5.new/epp/Makefile.am Wed May 30 14:08:45 2001
151 #along with GNU CC; see the file COPYING. If not, write to
152 #the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
157 -bindir=$(prefix)/enlightenment/bin
168 -#install-exec-local:
169 -# if [ x@USE_FSSTD@ = "xno" ]; then \
170 -# ../mkinstalldirs $(exec_prefix)/bin; \
171 -# for i in $(bin_PROGRAMS); do \
172 -# rm -f $(exec_prefix)/bin/$$i; \
173 -# $(LN_S) $(bindir)/$$i $(exec_prefix)/bin/$$i; \
178 - for i in $(bin_PROGRAMS); do \
179 - rm -f $(exec_prefix)/bin/$$i; \
181 diff -Nru enlightenment-0.16.5/scripts/Makefile.am enlightenment-0.16.5.new/scripts/Makefile.am
182 --- enlightenment-0.16.5/scripts/Makefile.am Thu Oct 21 19:49:58 1999
183 +++ enlightenment-0.16.5.new/scripts/Makefile.am Wed May 30 14:10:28 2001
186 -ENLIGHTENMENT_BIN=@bindir@
187 -ENLIGHTENMENT_ROOT=$(pkgdatadir)
188 -escriptsdatadir = @bindir@
190 -escriptsdatadir = $(prefix)/enlightenment/bin
191 -ENLIGHTENMENT_BIN=$(prefix)/enlightenment/bin
192 -ENLIGHTENMENT_ROOT=$(prefix)/enlightenment
196 +escriptsdatadir = $(bindir)
197 escriptsdata_SCRIPTS = e_gen_kde_menu e_gen_menu e_gen_gnome_menu \
198 -e_cache_clean e_cache_query enlightenment.install
199 + e_cache_clean e_cache_query enlightenment.install
201 EXTRA_DIST = e_gen_kde_menu e_gen_menu e_gen_gnome_menu e_cache_clean \
202 -e_cache_query enlightenment.install.in
203 + e_cache_query enlightenment.install.in
204 EXTRA_SCRIPTS = e_gen_kde_menu e_gen_menu e_gen_gnome_menu e_cache_clean \
205 -e_cache_query enlightenment.install
211 -# rm -f @bindir@/enlightenment.install; \
213 -# $(DESTDIR)$(escriptsdatadir)/enlightenment.install \
214 -# /enlightenment.install
216 + e_cache_query enlightenment.install
217 diff -Nru enlightenment-0.16.5/src/Makefile.am enlightenment-0.16.5.new/src/Makefile.am
218 --- enlightenment-0.16.5/src/Makefile.am Tue May 23 01:59:53 2000
219 +++ enlightenment-0.16.5.new/src/Makefile.am Wed May 30 14:08:45 2001
222 EXTRA_DIST = README ChangeLog TODO
226 -ENLIGHTENMENT_BIN=@bindir@
227 -ENLIGHTENMENT_ROOT=$(pkgdatadir)
229 -ENLIGHTENMENT_BIN=$(prefix)/enlightenment/bin
230 -ENLIGHTENMENT_ROOT=$(prefix)/enlightenment
231 -bindir=$(ENLIGHTENMENT_BIN)
235 bin_PROGRAMS = enlightenment
237 enlightenment_SOURCES = \
240 INCLUDES=-I$(top_srcdir) $(ESD_CFLAGS) $(IMLIB_CFLAGS) -I$(includedir) -I.. -I../intl -I$(top_srcdir)/intl
242 -DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\" -DLOCALEDIR=\"@LOCALEDIR@\"
244 -#install-exec-local:
245 -# if [ x@USE_FSSTD@ = "xno" ]; then \
246 -# ../mkinstalldirs $(exec_prefix)/bin; \
247 -# for i in $(bin_PROGRAMS); do \
248 -# rm -f $(exec_prefix)/bin/$$i; \
249 -# $(LN_S) $(bindir)/$$i $(exec_prefix)/bin/$$i; \
252 +DEFS=-DENLIGHTENMENT_ROOT=\"$(pkgdatadir)\" -DENLIGHTENMENT_BIN=\"$(bindir)\" -DLOCALEDIR=\"$(datadir)/locale\" -DCONFIGDATADIR=\"$(sysconfdir)/config\"
255 - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes; \
256 - rm -f $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/DEFAULT; \
257 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/themes; \
258 + rm -f $(DESTDIR)$(pkgdatadir)/themes/DEFAULT; \
260 BrushedMetal-Tigert \
261 - $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/DEFAULT;
264 - for i in $(bin_PROGRAMS); do \
265 - rm -f $(exec_prefix)/bin/$$i; \
267 + $(DESTDIR)$(pkgdatadir)/themes/DEFAULT;
268 diff -Nru enlightenment-0.16.5/src/themes/Makefile.am enlightenment-0.16.5.new/src/themes/Makefile.am
269 --- enlightenment-0.16.5/src/themes/Makefile.am Fri Mar 31 05:43:45 2000
270 +++ enlightenment-0.16.5.new/src/themes/Makefile.am Wed May 30 14:08:45 2001
275 -ethemedir = $(prefix)/share/enlightenment/themes
277 -ethemedir = $(prefix)/enlightenment/themes
279 +ethemedir = $(datadir)/enlightenment/themes
281 EXTRA_DIST = BrushedMetal-Tigert.etheme ShinyMetal.etheme BlueSteel.etheme Ganymede.etheme BrushedMetal-Tigert.etheme.ja ShinyMetal.etheme.ja BlueSteel.etheme.ja Ganymede.etheme.ja
283 diff -Nru enlightenment-0.16.5/src/themes/configs/Makefile.am enlightenment-0.16.5.new/src/themes/configs/Makefile.am
284 --- enlightenment-0.16.5/src/themes/configs/Makefile.am Fri Mar 31 05:43:46 2000
285 +++ enlightenment-0.16.5.new/src/themes/configs/Makefile.am Wed May 30 14:08:45 2001
293 backup-colormodifiers.cfg \
299 -configdatadir = $(prefix)/share/enlightenment/config
301 -configdatadir = $(prefix)/enlightenment/config
304 -EXTRA_DIST = $(configdata_DATA) config.ja
305 +EXTRA_DIST = $(sysconf_DATA) config.ja
308 - $(mkinstalldirs) $(DESTDIR)$(configdatadir)
309 + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/config
312 - gzip -d -c < $(srcdir)/config.ja | (cd $(DESTDIR)$(configdatadir); tar -xmf -)
313 + gzip -d -c < $(srcdir)/config.ja | (cd $(DESTDIR)$(sysconfdir); tar -xmf -)
314 diff -Nru enlightenment-0.16.5/src/themes/configs/backup/Makefile.am enlightenment-0.16.5.new/src/themes/configs/backup/Makefile.am
315 --- enlightenment-0.16.5/src/themes/configs/backup/Makefile.am Mon Aug 30 18:12:07 1999
316 +++ enlightenment-0.16.5.new/src/themes/configs/backup/Makefile.am Wed May 30 14:08:45 2001
319 -ebackupdir = $(prefix)/share/enlightenment/config/backup
321 -ebackupdir = $(prefix)/enlightenment/config/backup
323 +ebackupdir = $(sysconfdir)/config/backup
327 diff -Nru enlightenment-0.16.5/src/themes/configs/pix/Makefile.am enlightenment-0.16.5.new/src/themes/configs/pix/Makefile.am
328 --- enlightenment-0.16.5/src/themes/configs/pix/Makefile.am Wed Oct 6 16:55:56 1999
329 +++ enlightenment-0.16.5.new/src/themes/configs/pix/Makefile.am Wed May 30 14:08:45 2001
332 -epixdir = $(prefix)/share/enlightenment/config/pix
334 -epixdir = $(prefix)/enlightenment/config/pix
336 +epixdir = $(sysconfdir)/config/pix
338 epix_DATA = wait1.png wait2.png wait3.png wait4.png \
339 wait5.png wait6.png wait7.png wait8.png \