e16-ac_am_fixes.patch

   1 diff -Nur enlightenment-0.16.7.1.orig/config/Makefile.am enlightenment-0.16.7.1/config/Makefile.am
   2 --- enlightenment-0.16.7.1.orig/config/Makefile.am      2004-07-12 21:41:53.000000000 +0200
   3 +++ enlightenment-0.16.7.1/config/Makefile.am   2004-10-09 20:19:33.830189704 +0200
   4 @@ -1,6 +1,6 @@
   5  SUBDIRS = pix
   6
   7 -configdata_DATA = \
   8 +sysconf_DATA = \
   9  actionclasses.cfg \
  10  backup-borders.cfg \
  11  backup-colormodifiers.cfg \
  12 @@ -14,10 +14,10 @@
  13  keybindings.cfg \
  14  menus.cfg
  15
  16 -configdatadir = $(ENLIGHTENMENT_ROOT)/config
  17 +configdatadir = $(sysconfdir)
  18
  19  TRANSLATIONS = config.ja config.pl config.ko
  20 -EXTRA_DIST = $(configdata_DATA) $(TRANSLATIONS) strings.c
  21 +EXTRA_DIST = $(sysconf_DATA) $(TRANSLATIONS) strings.c
  22
  23  install-data-local:
  24         $(mkinstalldirs) $(DESTDIR)$(configdatadir)
  25 diff -Nur enlightenment-0.16.7.1.orig/config/pix/Makefile.am enlightenment-0.16.7.1/config/pix/Makefile.am
  26 --- enlightenment-0.16.7.1.orig/config/pix/Makefile.am  2003-07-15 07:46:24.000000000 +0200
  27 +++ enlightenment-0.16.7.1/config/pix/Makefile.am       2004-10-09 20:19:33.832189400 +0200
  28 @@ -1,4 +1,4 @@
  29 -epixdir = $(ENLIGHTENMENT_ROOT)/config/pix
  30 +epixdir = $(sysconfdir)/pix
  31
  32  epix_DATA = wait1.png wait2.png wait3.png wait4.png \
  33              wait5.png wait6.png wait7.png wait8.png \
  34 diff -Nur enlightenment-0.16.7.1.orig/configure.in enlightenment-0.16.7.1/configure.in
  35 --- enlightenment-0.16.7.1.orig/configure.in    2004-08-13 21:18:28.000000000 +0200
  36 +++ enlightenment-0.16.7.1/configure.in 2004-10-09 20:20:06.645201064 +0200
  37 @@ -30,7 +30,7 @@
  38  AC_DEFINE_UNQUOTED(ENLIGHTENMENT_RELEASE, "$ENLIGHTENMENT_RELEASE", [Release])
  39  fi
  40
  41 -ALL_LINGUAS="da de en_US es fr hu ko nl no ru sv pt pl pt_BR tr ja"
  42 +ALL_LINGUAS="da de en_US es fr hu ja ko nb nl pl pt pt_BR ru sv tr"
  43
  44  AC_PROG_CC
  45  AC_PROG_MAKE_SET
  46 @@ -70,9 +70,6 @@
  47    AC_SUBST(LIBINTL)
  48  fi
  49
  50 -AC_ARG_ENABLE(fsstd,
  51 -  [  --enable-fsstd          install files following FSSTD [default=no]], ,enable_fsstd=no)
  52 -
  53  AC_ARG_ENABLE(sound,
  54    [  --enable-sound          compile with sound support [default=yes]], ,enable_sound=yes)
  55
  56 @@ -89,20 +86,16 @@
  57  dnl The following test must come after AM_GNU_GETTEXT as it relies on
  58  dnl ${DATADIRNAME} being defined.
  59
  60 -if test "x$enable_fsstd" = "xyes"; then
  61 -  LOCALEDIR=${prefix}/${DATADIRNAME}/locale
  62 -else
  63 -  datadir=${prefix}
  64 -  exec_prefix=${prefix}/enlightenment
  65 -  LOCALEDIR=${prefix}/enlightenment/locale
  66 -fi
  67  ENLIGHTENMENT_ROOT=`eval echo ${datadir}/enlightenment`
  68  ENLIGHTENMENT_BIN=`eval echo ${bindir}`
  69 +ENLIGHTENMENT_CONF=`eval echo ${sysconfdir}`
  70  AC_SUBST(ENLIGHTENMENT_ROOT)
  71  AC_SUBST(ENLIGHTENMENT_BIN)
  72 +AC_SUBST(ENLIGHTENMENT_CONF)
  73  AC_SUBST(LOCALEDIR)
  74  AC_DEFINE_UNQUOTED(ENLIGHTENMENT_ROOT, "$ENLIGHTENMENT_ROOT", [The installation root directory])
  75  AC_DEFINE_UNQUOTED(ENLIGHTENMENT_BIN, "$ENLIGHTENMENT_BIN", [The installation bin directory])
  76 +AC_DEFINE_UNQUOTED(ENLIGHTENMENT_CONF, "$ENLIGHTENMENT_CONF", [The installation config directory])
  77  AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR",  [The installation locale directory])
  78
  79  if test "x$enable_sound" = "xyes"; then
  80 diff -Nur enlightenment-0.16.7.1.orig/scripts/Makefile.am enlightenment-0.16.7.1/scripts/Makefile.am
  81 --- enlightenment-0.16.7.1.orig/scripts/Makefile.am     2003-09-06 21:32:17.000000000 +0200
  82 +++ enlightenment-0.16.7.1/scripts/Makefile.am  2004-10-09 20:28:29.569744912 +0200
  83 @@ -1,9 +1,9 @@
  84
  85 -EXTRA_DIST = e_gen_kde_menu e_gen_menu e_gen_gnome_menu e_cache_clean \
  86 -e_cache_query enlightenment.install.in e_gen_menu.e16_5 \
  87 -e_gen_menu.pl e_cache_clean.pl e_cache_query.pl
  88 -script_SCRIPTS = e_gen_kde_menu e_gen_menu e_gen_gnome_menu e_cache_clean \
  89 -e_cache_query enlightenment.install e_gen_menu.e16_5 \
  90 -e_gen_menu.pl e_cache_clean.pl e_cache_query.pl
  91 +EXTRA_DIST =  e_cache_clean \
  92 +e_cache_query enlightenment.install.in  \
  93 + e_cache_clean.pl e_cache_query.pl
  94 +script_SCRIPTS =  e_cache_clean \
  95 +e_cache_query enlightenment.install  \
  96 + e_cache_clean.pl e_cache_query.pl
  97
  98  scriptdir = $(ENLIGHTENMENT_ROOT)/scripts
  99 diff -Nur enlightenment-0.16.7.1.orig/themes/Makefile.am enlightenment-0.16.7.1/themes/Makefile.am
 100 --- enlightenment-0.16.7.1.orig/themes/Makefile.am      2004-05-20 11:20:09.000000000 +0200
 101 +++ enlightenment-0.16.7.1/themes/Makefile.am   2004-10-09 20:30:28.255701904 +0200
 102 @@ -1,8 +1,8 @@
 103
 104  THEME = winter
 105 -THEME_FILES = winter.etheme winter.etheme.ko
 106 +THEME_FILES = winter.etheme winter.etheme.i18n
 107
 108 -ethemedir = $(datadir)/themes
 109 +ethemedir = $(pkgdatadir)/themes
 110
 111  EXTRA_DIST = $(THEME_FILES)
 112
 113 @@ -13,7 +13,6 @@
 114         for tf in $(THEME_FILES); do \
 115                 gzip -d -c < $(srcdir)/$$tf | (cd $(THEME_DIR); tar -xmf -); \
 116         done
 117 -       -if [ -n "$(USER)" ]; then chown -R $(USER) $(THEME_DIR); else chown -R root $(THEME_DIR); fi
 118
 119
 120  uninstall-local: