enlightenment-ac_am_fixes.patch

   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
   4 @@ -10,8 +10,6 @@
   5
   6  AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
   7  AM_MAINTAINER_MODE
   8 -AM_CONDITIONAL(FSSTD, test x$enable_fsstd = xyes)
   9 -AC_SUBST(USE_FSSTD)
  10
  11  dnl reasonable guesses for where stuff is installed
  12  if test "x$prefix" = "xNONE"; then
  13 @@ -31,10 +29,6 @@
  14  AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MICRO, "$ENLIGHTENMENT_MICRO")
  15  AC_SUBST(ENLIGHTENMENT_MICRO)
  16
  17 -AC_SUBST(ENLIGHTENMENT_ROOT)
  18 -AC_SUBST(ENLIGHTENMENT_BIN)
  19 -AC_SUBST(LOCALEDIR)
  20 -
  21  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  22  AC_DEFINE_UNQUOTED(VERSION,"$VERSION")
  23  AC_SUBST(PACKAGE)
  24 @@ -73,8 +67,6 @@
  25
  26  AM_GNU_GETTEXT
  27
  28 -AC_ARG_ENABLE(fsstd, [  --enable-fsstd          install files following FSSTD [default=no]], ,enable_fsstd=no)
  29 -
  30  AC_ARG_ENABLE(sound, [  --enable-sound          compile with sound support [default=yes]], ,enable_sound=yes)
  31
  32  AC_ARG_ENABLE(upgrade, [  --enable-upgrade        compile with auto-upgrade support [default=yes]], ,enable_upgrade=yes)
  33 @@ -82,18 +74,6 @@
  34  dnl The following test must come after AM_GNU_GETTEXT as it relies on
  35  dnl ${DATADIRNAME} being defined.
  36
  37 -if test "x$enable_fsstd" = "xyes"; then
  38 -       ENLIGHTENMENT_ROOT=${datadir}/enlightenment
  39 -       ENLIGHTENMENT_BIN=${bindir}
  40 -       LOCALEDIR=${prefix}/${DATADIRNAME}/locale
  41 -       USE_FSSTD=yes
  42 -else
  43 -       ENLIGHTENMENT_ROOT=${prefix}/enlightenment
  44 -       ENLIGHTENMENT_BIN=${prefix}/enlightenment/bin
  45 -       LOCALEDIR=${prefix}/enlightenment/locale
  46 -       USE_FSSTD=no
  47 -fi
  48 -
  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)"
  52 @@ -188,8 +168,6 @@
  53  AC_SUBST(XVM_LIBS)
  54  AC_SUBST(XINERAMA_LIBS)
  55  AC_SUBST(XKB)
  56 -AC_SUBST(ENLIGHTENMENT_ROOT)
  57 -AC_SUBST(ENLIGHTENMENT_BIN)
  58
  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
  64 @@ -1,8 +1,4 @@
  65 -if FSSTD
  66  edocdatadir = $(pkgdatadir)/E-docs
  67 -else
  68 -edocdatadir = $(prefix)/enlightenment/E-docs
  69 -endif
  70
  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
  76 @@ -2,16 +2,6 @@
  77
  78  EXTRA_DIST = ChangeLog README
  79
  80 -if FSSTD
  81 -bindir = @bindir@
  82 -ENLIGHTENMENT_BIN=$(bindir)
  83 -ENLIGHTENMENT_ROOT=$(pkgdatadir)
  84 -else
  85 -ENLIGHTENMENT_BIN=$(prefix)/enlightenment/bin
  86 -ENLIGHTENMENT_ROOT=$(prefix)/enlightenment
  87 -bindir=$(ENLIGHTENMENT_BIN)
  88 -endif
  89 -
  90  bin_PROGRAMS = dox
  91
  92  dox_SOURCES = \
  93 @@ -33,18 +23,4 @@
  94
  95  INCLUDES=-I$(top_srcdir) $(IMLIB_CFLAGS) -I$(includedir) -I..
  96
  97 -DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\"
  98 -
  99 -#install-exec-local:
 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; \
 105 -#        done; \
 106 -#      fi
 107 -
 108 -uninstall-local:
 109 -       for i in $(bin_PROGRAMS); do \
 110 -         rm -f $(exec_prefix)/bin/$$i; \
 111 -       done
 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
 116 @@ -1,10 +1,3 @@
 117 -if FSSTD
 118 -bindir = @bindir@
 119 -ENLIGHTENMENT_ROOT=$(pkglibdir)
 120 -else
 121 -bindir=$(prefix)/enlightenment/bin
 122 -ENLIGHTENMENT_ROOT=$(prefix)/enlightenment
 123 -endif
 124
 125  bin_PROGRAMS = eesh
 126
 127 @@ -23,18 +16,4 @@
 128
 129  INCLUDES=-I$(top_srcdir) $(IMLIB_CFLAGS) -I$(includedir) -I..
 130
 131 -DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\"
 132 -
 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; \
 139 -#        done; \
 140 -#      fi
 141 -
 142 -uninstall-local:
 143 -       for i in $(bin_PROGRAMS); do \
 144 -         rm -f $(exec_prefix)/bin/$$i; \
 145 -       done
 146 +DEFS=
 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
 150 @@ -17,12 +17,6 @@
 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.
 153
 154 -if FSSTD
 155 -bindir = @bindir@
 156 -else
 157 -bindir=$(prefix)/enlightenment/bin
 158 -endif
 159 -
 160  bin_PROGRAMS = epp
 161
 162  epp_SOURCES = \
 163 @@ -59,17 +53,3 @@
 164  -DTARGET_VT=11
 165
 166  LIBS =
 167 -
 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; \
 174 -#        done; \
 175 -#      fi
 176 -
 177 -uninstall-local:
 178 -       for i in $(bin_PROGRAMS); do \
 179 -         rm -f $(exec_prefix)/bin/$$i; \
 180 -       done
 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
 184 @@ -1,28 +1,9 @@
 185 -if FSSTD
 186 -ENLIGHTENMENT_BIN=@bindir@
 187 -ENLIGHTENMENT_ROOT=$(pkgdatadir)
 188 -escriptsdatadir = @bindir@
 189 -else
 190 -escriptsdatadir = $(prefix)/enlightenment/bin
 191 -ENLIGHTENMENT_BIN=$(prefix)/enlightenment/bin
 192 -ENLIGHTENMENT_ROOT=$(prefix)/enlightenment
 193 -endif
 194
 195 -escriptsdata_DATA =
 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
 200
 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
 206 -
 207 -#if FSSTD
 208 -#
 209 -#else
 210 -#install-exec-hook:
 211 -#      rm -f @bindir@/enlightenment.install; \
 212 -#      $(LN_S) \
 213 -#      $(DESTDIR)$(escriptsdatadir)/enlightenment.install \
 214 -#      /enlightenment.install
 215 -#endif
 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
 220 @@ -2,17 +2,6 @@
 221
 222  EXTRA_DIST = README ChangeLog TODO
 223
 224 -if FSSTD
 225 -bindir=@bindir@
 226 -ENLIGHTENMENT_BIN=@bindir@
 227 -ENLIGHTENMENT_ROOT=$(pkgdatadir)
 228 -else
 229 -ENLIGHTENMENT_BIN=$(prefix)/enlightenment/bin
 230 -ENLIGHTENMENT_ROOT=$(prefix)/enlightenment
 231 -bindir=$(ENLIGHTENMENT_BIN)
 232 -endif
 233 -
 234 -
 235  bin_PROGRAMS = enlightenment
 236
 237  enlightenment_SOURCES = \
 238 @@ -107,25 +96,11 @@
 239
 240  INCLUDES=-I$(top_srcdir) $(ESD_CFLAGS) $(IMLIB_CFLAGS) -I$(includedir) -I.. -I../intl -I$(top_srcdir)/intl
 241
 242 -DEFS=-DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\" -DLOCALEDIR=\"@LOCALEDIR@\"
 243 -
 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; \
 250 -#        done; \
 251 -#      fi
 252 +DEFS=-DENLIGHTENMENT_ROOT=\"$(pkgdatadir)\" -DENLIGHTENMENT_BIN=\"$(bindir)\" -DLOCALEDIR=\"$(datadir)/locale\" -DCONFIGDATADIR=\"$(sysconfdir)\"
 253
 254  install-data-local:
 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; \
 259          $(LN_S) \
 260         BrushedMetal-Tigert \
 261 -       $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/DEFAULT;
 262 -
 263 -uninstall-local:
 264 -       for i in $(bin_PROGRAMS); do \
 265 -         rm -f $(exec_prefix)/bin/$$i; \
 266 -       done
 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
 271 @@ -1,10 +1,6 @@
 272  SUBDIRS = configs
 273
 274 -if FSSTD
 275 -ethemedir = $(prefix)/share/enlightenment/themes
 276 -else
 277 -ethemedir = $(prefix)/enlightenment/themes
 278 -endif
 279 +ethemedir = $(datadir)/enlightenment/themes
 280
 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
 282
 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
 286 @@ -1,6 +1,6 @@
 287  SUBDIRS = pix backup
 288
 289 -configdata_DATA = \
 290 +sysconf_DATA = \
 291  actionclasses.cfg \
 292  backup-borders.cfg \
 293  backup-colormodifiers.cfg \
 294 @@ -21,16 +21,11 @@
 295  keybindings.rh.cfg \
 296  menus.rh.cfg
 297
 298 -if FSSTD
 299 -configdatadir = $(prefix)/share/enlightenment/config
 300 -else
 301 -configdatadir = $(prefix)/enlightenment/config
 302 -endif
 303
 304 -EXTRA_DIST = $(configdata_DATA) config.ja
 305 +EXTRA_DIST = $(sysconf_DATA) config.ja
 306
 307  install-data-local:
 308 -       $(mkinstalldirs) $(DESTDIR)$(configdatadir)
 309 +       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
 310
 311  # Japanese
 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
 317 @@ -1,8 +1,4 @@
 318 -if FSSTD
 319 -ebackupdir = $(prefix)/share/enlightenment/config/backup
 320 -else
 321 -ebackupdir = $(prefix)/enlightenment/config/backup
 322 -endif
 323 +ebackupdir = $(sysconfdir)/backup
 324
 325  ebackup_DATA =
 326
 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
 330 @@ -1,8 +1,4 @@
 331 -if FSSTD
 332 -epixdir = $(prefix)/share/enlightenment/config/pix
 333 -else
 334 -epixdir = $(prefix)/enlightenment/config/pix
 335 -endif
 336 +epixdir = $(sysconfdir)/pix
 337
 338  epix_DATA = wait1.png wait2.png wait3.png wait4.png \
 339              wait5.png wait6.png wait7.png wait8.png \