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
5 AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MICRO, "$ENLIGHTENMENT_MICRO", [Micro Version])
6 AC_SUBST(ENLIGHTENMENT_MICRO)
8 -AC_SUBST(ENLIGHTENMENT_ROOT)
9 AC_SUBST(ENLIGHTENMENT_BIN)
12 ALL_LINGUAS="de dk en_US es fr hu ko nl no ru sv pt pl pt_BR tr ja"
17 AM_GNU_GETTEXT_VERSION(0.10.40)
19 -AC_ARG_ENABLE(fsstd, [ --enable-fsstd install files following FSSTD [default=no]], ,enable_fsstd=no)
21 AC_ARG_ENABLE(sound, [ --enable-sound compile with sound support [default=yes]], ,enable_sound=yes)
23 AC_ARG_ENABLE(upgrade, [ --enable-upgrade compile with auto-upgrade support [default=yes]], ,enable_upgrade=yes)
25 dnl The following test must come after AM_GNU_GETTEXT as it relies on
26 dnl ${DATADIRNAME} being defined.
28 -if test "x$enable_fsstd" = "xyes"; then
29 - LOCALEDIR=${prefix}/${DATADIRNAME}/locale
32 - exec_prefix=${prefix}/enlightenment
33 - LOCALEDIR=${prefix}/enlightenment/locale
35 -ENLIGHTENMENT_ROOT=`eval echo ${datadir}/enlightenment`
36 ENLIGHTENMENT_BIN=`eval echo ${bindir}`
38 if test "x$enable_sound" = "xyes"; then
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
46 INCLUDES=-I$(top_srcdir) $(IMLIB_CFLAGS) -I$(includedir) -I..
48 -DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\"
51 - for i in $(bin_PROGRAMS); do \
52 - rm -f $(exec_prefix)/bin/$$i; \
54 +DEFS=-DENLIGHTENMENT_ROOT=\"$(pkgdatadir)\" -DENLIGHTENMENT_BIN=\"$(bindir)\"
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
59 -edocdatadir = $(ENLIGHTENMENT_ROOT)/E-docs
60 +edocdatadir = $(pkgdatadir)/E-docs
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
69 INCLUDES=-I$(top_srcdir) $(IMLIB_CFLAGS) -I$(includedir) -I..
71 -DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\"
74 - for i in $(bin_PROGRAMS); do \
75 - rm -f $(exec_prefix)/bin/$$i; \
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
87 - for i in $(bin_PROGRAMS); do \
88 - rm -f $(exec_prefix)/bin/$$i; \
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
94 EXTRA_DIST = e_gen_kde_menu e_gen_menu e_gen_gnome_menu e_cache_clean \
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
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 @@
112 INCLUDES = $(ESD_CFLAGS) $(IMLIB_CFLAGS) -I$(top_builddir) -I$(top_srcdir)/intl
114 -DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\" -DLOCALEDIR=\"@LOCALEDIR@\"
115 +DEFS=-DENLIGHTENMENT_ROOT=\"$(pkgdatadir)\" -DENLIGHTENMENT_BIN=\"$(bindir)\" -DLOCALEDIR=\"$(datadir)/locale\" -DCONFIGDATADIR=\"$(sysconfdir)\"
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; \
123 BrushedMetal-Tigert \
124 - $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/DEFAULT;
125 + $(DESTDIR)$(pkgdatadir)/themes/DEFAULT;
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
135 -ethemedir = $(ENLIGHTENMENT_ROOT)/themes
136 +ethemedir = $(pkgdatadir)/themes
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
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
150 backup-colormodifiers.cfg \
155 -configdatadir = $(ENLIGHTENMENT_ROOT)/config
156 +configdatadir = $(sysconfdir)
158 TRANSLATIONS = config.ja config.pl
159 -EXTRA_DIST = $(configdata_DATA) $(TRANSLATIONS)
160 +EXTRA_DIST = $(sysconf_DATA) $(TRANSLATIONS)
163 - $(mkinstalldirs) $(DESTDIR)$(configdatadir)
164 + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
165 for f in $(TRANSLATIONS); do \
166 gzip -d -c < $(srcdir)/$$f | \
167 - (cd $(DESTDIR)$(configdatadir); tar -xmf -) \
168 + (cd $(DESTDIR)$(sysconfdir); tar -xmf -) \
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) \
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
181 -ebackupdir = $(ENLIGHTENMENT_ROOT)/config/backup
182 +ebackupdir = $(sysconfdir)/backup
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
190 -epixdir = $(ENLIGHTENMENT_ROOT)/config/pix
191 +epixdir = $(sysconfdir)/pix
193 epix_DATA = wait1.png wait2.png wait3.png wait4.png \
194 wait5.png wait6.png wait7.png wait8.png \