diff -Nru enlightenment-0.16.5/configure.in enlightenment-0.16.5.new/configure.in --- enlightenment-0.16.5/configure.in Thu Jul 27 23:23:28 2000 +++ enlightenment-0.16.5.new/configure.in Wed May 30 14:08:45 2001 @@ -10,8 +10,6 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) AM_MAINTAINER_MODE -AM_CONDITIONAL(FSSTD, test x$enable_fsstd = xyes) -AC_SUBST(USE_FSSTD) dnl reasonable guesses for where stuff is installed if test "x$prefix" = "xNONE"; then @@ -31,10 +29,6 @@ AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MICRO, "$ENLIGHTENMENT_MICRO") AC_SUBST(ENLIGHTENMENT_MICRO) -AC_SUBST(ENLIGHTENMENT_ROOT) -AC_SUBST(ENLIGHTENMENT_BIN) -AC_SUBST(LOCALEDIR) - AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(VERSION,"$VERSION") AC_SUBST(PACKAGE) @@ -73,8 +67,6 @@ AM_GNU_GETTEXT -AC_ARG_ENABLE(fsstd, [ --enable-fsstd install files following FSSTD [default=no]], ,enable_fsstd=no) - AC_ARG_ENABLE(sound, [ --enable-sound compile with sound support [default=yes]], ,enable_sound=yes) AC_ARG_ENABLE(upgrade, [ --enable-upgrade compile with auto-upgrade support [default=yes]], ,enable_upgrade=yes) @@ -82,18 +74,6 @@ dnl The following test must come after AM_GNU_GETTEXT as it relies on dnl ${DATADIRNAME} being defined. -if test "x$enable_fsstd" = "xyes"; then - ENLIGHTENMENT_ROOT=${datadir}/enlightenment - ENLIGHTENMENT_BIN=${bindir} - LOCALEDIR=${prefix}/${DATADIRNAME}/locale - USE_FSSTD=yes -else - ENLIGHTENMENT_ROOT=${prefix}/enlightenment - ENLIGHTENMENT_BIN=${prefix}/enlightenment/bin - LOCALEDIR=${prefix}/enlightenment/locale - USE_FSSTD=no -fi - if test "x$enable_sound" = "xyes"; then AM_PATH_ESD(0.2.17,AC_DEFINE(HAVE_LIBESD),[ echo "WARNING: Enlightenment needs a system with libesd.so (EsounD)" @@ -188,8 +168,6 @@ AC_SUBST(XVM_LIBS) AC_SUBST(XINERAMA_LIBS) AC_SUBST(XKB) -AC_SUBST(ENLIGHTENMENT_ROOT) -AC_SUBST(ENLIGHTENMENT_BIN) AC_CHECK_LIB(Fridge,mass_quantities_of_bass_ale) AC_CHECK_LIB(Fridge,mass_quantities_of_any_ale, , [ diff -Nru enlightenment-0.16.5/dox/E-docs/Makefile.am enlightenment-0.16.5.new/dox/E-docs/Makefile.am --- enlightenment-0.16.5/dox/E-docs/Makefile.am Tue Mar 14 20:27:32 2000 +++ enlightenment-0.16.5.new/dox/E-docs/Makefile.am Wed May 30 14:08:45 2001 @@ -1,8 +1,4 @@ -if FSSTD edocdatadir = $(pkgdatadir)/E-docs -else -edocdatadir = $(prefix)/enlightenment/E-docs -endif edocdata_DATA = @edocdata@ edocdata_SCRIPTS = @edocexec@ diff -Nru enlightenment-0.16.5/dox/Makefile.am enlightenment-0.16.5.new/dox/Makefile.am --- enlightenment-0.16.5/dox/Makefile.am Fri Mar 31 03:18:28 2000 +++ enlightenment-0.16.5.new/dox/Makefile.am Wed May 30 14:08:45 2001 @@ -2,16 +2,6 @@ EXTRA_DIST = ChangeLog README -if FSSTD -bindir = @bindir@ -ENLIGHTENMENT_BIN=$(bindir) -ENLIGHTENMENT_ROOT=$(pkgdatadir) -else -ENLIGHTENMENT_BIN=$(prefix)/enlightenment/bin -ENLIGHTENMENT_ROOT=$(prefix)/enlightenment -bindir=$(ENLIGHTENMENT_BIN) -endif - bin_PROGRAMS = dox dox_SOURCES = \ @@ -33,18 +23,4 @@ INCLUDES=-I$(top_srcdir) $(IMLIB_CFLAGS) -I$(includedir) -I.. -DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\" - -#install-exec-local: -# if [ x@USE_FSSTD@ = "xno" ]; then \ -# ../mkinstalldirs $(exec_prefix)/bin; \ -# for i in $(bin_PROGRAMS); do \ -# rm -f $(exec_prefix)/bin/$$i; \ -# $(LN_S) $(bindir)/$$i $(exec_prefix)/bin/$$i; \ -# done; \ -# fi - -uninstall-local: - for i in $(bin_PROGRAMS); do \ - rm -f $(exec_prefix)/bin/$$i; \ - done +DEFS=-DENLIGHTENMENT_ROOT=\"$(pkgdatadir)\" -DENLIGHTENMENT_BIN=\"$(bindir)\" diff -Nru enlightenment-0.16.5/eesh/Makefile.am enlightenment-0.16.5.new/eesh/Makefile.am --- enlightenment-0.16.5/eesh/Makefile.am Wed Aug 18 00:56:29 1999 +++ enlightenment-0.16.5.new/eesh/Makefile.am Wed May 30 14:08:45 2001 @@ -1,10 +1,3 @@ -if FSSTD -bindir = @bindir@ -ENLIGHTENMENT_ROOT=$(pkglibdir) -else -bindir=$(prefix)/enlightenment/bin -ENLIGHTENMENT_ROOT=$(prefix)/enlightenment -endif bin_PROGRAMS = eesh @@ -23,18 +16,4 @@ INCLUDES=-I$(top_srcdir) $(IMLIB_CFLAGS) -I$(includedir) -I.. -DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" - -#install-exec-local: -# if [ x@USE_FSSTD@ = "xno" ]; then \ -# ../mkinstalldirs $(exec_prefix)/bin; \ -# for i in $(bin_PROGRAMS); do \ -# rm -f $(exec_prefix)/bin/$$i; \ -# $(LN_S) $(bindir)/$$i $(exec_prefix)/bin/$$i; \ -# done; \ -# fi - -uninstall-local: - for i in $(bin_PROGRAMS); do \ - rm -f $(exec_prefix)/bin/$$i; \ - done +DEFS= diff -Nru enlightenment-0.16.5/epp/Makefile.am enlightenment-0.16.5.new/epp/Makefile.am --- enlightenment-0.16.5/epp/Makefile.am Wed Aug 18 00:56:29 1999 +++ enlightenment-0.16.5.new/epp/Makefile.am Wed May 30 14:08:45 2001 @@ -17,12 +17,6 @@ #along with GNU CC; see the file COPYING. If not, write to #the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -if FSSTD -bindir = @bindir@ -else -bindir=$(prefix)/enlightenment/bin -endif - bin_PROGRAMS = epp epp_SOURCES = \ @@ -59,17 +53,3 @@ -DTARGET_VT=11 LIBS = - -#install-exec-local: -# if [ x@USE_FSSTD@ = "xno" ]; then \ -# ../mkinstalldirs $(exec_prefix)/bin; \ -# for i in $(bin_PROGRAMS); do \ -# rm -f $(exec_prefix)/bin/$$i; \ -# $(LN_S) $(bindir)/$$i $(exec_prefix)/bin/$$i; \ -# done; \ -# fi - -uninstall-local: - for i in $(bin_PROGRAMS); do \ - rm -f $(exec_prefix)/bin/$$i; \ - done diff -Nru enlightenment-0.16.5/scripts/Makefile.am enlightenment-0.16.5.new/scripts/Makefile.am --- enlightenment-0.16.5/scripts/Makefile.am Thu Oct 21 19:49:58 1999 +++ enlightenment-0.16.5.new/scripts/Makefile.am Wed May 30 14:10:28 2001 @@ -1,28 +1,9 @@ -if FSSTD -ENLIGHTENMENT_BIN=@bindir@ -ENLIGHTENMENT_ROOT=$(pkgdatadir) -escriptsdatadir = @bindir@ -else -escriptsdatadir = $(prefix)/enlightenment/bin -ENLIGHTENMENT_BIN=$(prefix)/enlightenment/bin -ENLIGHTENMENT_ROOT=$(prefix)/enlightenment -endif -escriptsdata_DATA = +escriptsdatadir = $(bindir) escriptsdata_SCRIPTS = e_gen_kde_menu e_gen_menu e_gen_gnome_menu \ -e_cache_clean e_cache_query enlightenment.install + e_cache_clean e_cache_query enlightenment.install EXTRA_DIST = e_gen_kde_menu e_gen_menu e_gen_gnome_menu e_cache_clean \ -e_cache_query enlightenment.install.in + e_cache_query enlightenment.install.in EXTRA_SCRIPTS = e_gen_kde_menu e_gen_menu e_gen_gnome_menu e_cache_clean \ -e_cache_query enlightenment.install - -#if FSSTD -# -#else -#install-exec-hook: -# rm -f @bindir@/enlightenment.install; \ -# $(LN_S) \ -# $(DESTDIR)$(escriptsdatadir)/enlightenment.install \ -# /enlightenment.install -#endif + e_cache_query enlightenment.install diff -Nru enlightenment-0.16.5/src/Makefile.am enlightenment-0.16.5.new/src/Makefile.am --- enlightenment-0.16.5/src/Makefile.am Tue May 23 01:59:53 2000 +++ enlightenment-0.16.5.new/src/Makefile.am Wed May 30 14:08:45 2001 @@ -2,17 +2,6 @@ EXTRA_DIST = README ChangeLog TODO -if FSSTD -bindir=@bindir@ -ENLIGHTENMENT_BIN=@bindir@ -ENLIGHTENMENT_ROOT=$(pkgdatadir) -else -ENLIGHTENMENT_BIN=$(prefix)/enlightenment/bin -ENLIGHTENMENT_ROOT=$(prefix)/enlightenment -bindir=$(ENLIGHTENMENT_BIN) -endif - - bin_PROGRAMS = enlightenment enlightenment_SOURCES = \ @@ -107,25 +96,11 @@ INCLUDES=-I$(top_srcdir) $(ESD_CFLAGS) $(IMLIB_CFLAGS) -I$(includedir) -I.. -I../intl -I$(top_srcdir)/intl -DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\" -DLOCALEDIR=\"@LOCALEDIR@\" - -#install-exec-local: -# if [ x@USE_FSSTD@ = "xno" ]; then \ -# ../mkinstalldirs $(exec_prefix)/bin; \ -# for i in $(bin_PROGRAMS); do \ -# rm -f $(exec_prefix)/bin/$$i; \ -# $(LN_S) $(bindir)/$$i $(exec_prefix)/bin/$$i; \ -# done; \ -# fi +DEFS=-DENLIGHTENMENT_ROOT=\"$(pkgdatadir)\" -DENLIGHTENMENT_BIN=\"$(bindir)\" -DLOCALEDIR=\"$(datadir)/locale\" -DCONFIGDATADIR=\"$(sysconfdir)/config\" install-data-local: - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes; \ - rm -f $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/DEFAULT; \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/themes; \ + rm -f $(DESTDIR)$(pkgdatadir)/themes/DEFAULT; \ $(LN_S) \ BrushedMetal-Tigert \ - $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/DEFAULT; - -uninstall-local: - for i in $(bin_PROGRAMS); do \ - rm -f $(exec_prefix)/bin/$$i; \ - done + $(DESTDIR)$(pkgdatadir)/themes/DEFAULT; diff -Nru enlightenment-0.16.5/src/themes/Makefile.am enlightenment-0.16.5.new/src/themes/Makefile.am --- enlightenment-0.16.5/src/themes/Makefile.am Fri Mar 31 05:43:45 2000 +++ enlightenment-0.16.5.new/src/themes/Makefile.am Wed May 30 14:08:45 2001 @@ -1,10 +1,6 @@ SUBDIRS = configs -if FSSTD -ethemedir = $(prefix)/share/enlightenment/themes -else -ethemedir = $(prefix)/enlightenment/themes -endif +ethemedir = $(datadir)/enlightenment/themes EXTRA_DIST = BrushedMetal-Tigert.etheme ShinyMetal.etheme BlueSteel.etheme Ganymede.etheme BrushedMetal-Tigert.etheme.ja ShinyMetal.etheme.ja BlueSteel.etheme.ja Ganymede.etheme.ja diff -Nru enlightenment-0.16.5/src/themes/configs/Makefile.am enlightenment-0.16.5.new/src/themes/configs/Makefile.am --- enlightenment-0.16.5/src/themes/configs/Makefile.am Fri Mar 31 05:43:46 2000 +++ enlightenment-0.16.5.new/src/themes/configs/Makefile.am Wed May 30 14:08:45 2001 @@ -1,6 +1,6 @@ SUBDIRS = pix backup -configdata_DATA = \ +sysconf_DATA = \ actionclasses.cfg \ backup-borders.cfg \ backup-colormodifiers.cfg \ @@ -21,16 +21,11 @@ keybindings.rh.cfg \ menus.rh.cfg -if FSSTD -configdatadir = $(prefix)/share/enlightenment/config -else -configdatadir = $(prefix)/enlightenment/config -endif -EXTRA_DIST = $(configdata_DATA) config.ja +EXTRA_DIST = $(sysconf_DATA) config.ja install-data-local: - $(mkinstalldirs) $(DESTDIR)$(configdatadir) + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/config # Japanese - gzip -d -c < $(srcdir)/config.ja | (cd $(DESTDIR)$(configdatadir); tar -xmf -) + gzip -d -c < $(srcdir)/config.ja | (cd $(DESTDIR)$(sysconfdir); tar -xmf -) diff -Nru enlightenment-0.16.5/src/themes/configs/backup/Makefile.am enlightenment-0.16.5.new/src/themes/configs/backup/Makefile.am --- enlightenment-0.16.5/src/themes/configs/backup/Makefile.am Mon Aug 30 18:12:07 1999 +++ enlightenment-0.16.5.new/src/themes/configs/backup/Makefile.am Wed May 30 14:08:45 2001 @@ -1,8 +1,4 @@ -if FSSTD -ebackupdir = $(prefix)/share/enlightenment/config/backup -else -ebackupdir = $(prefix)/enlightenment/config/backup -endif +ebackupdir = $(sysconfdir)/config/backup ebackup_DATA = diff -Nru enlightenment-0.16.5/src/themes/configs/pix/Makefile.am enlightenment-0.16.5.new/src/themes/configs/pix/Makefile.am --- enlightenment-0.16.5/src/themes/configs/pix/Makefile.am Wed Oct 6 16:55:56 1999 +++ enlightenment-0.16.5.new/src/themes/configs/pix/Makefile.am Wed May 30 14:08:45 2001 @@ -1,8 +1,4 @@ -if FSSTD -epixdir = $(prefix)/share/enlightenment/config/pix -else -epixdir = $(prefix)/enlightenment/config/pix -endif +epixdir = $(sysconfdir)/config/pix epix_DATA = wait1.png wait2.png wait3.png wait4.png \ wait5.png wait6.png wait7.png wait8.png \