- updated for e16

[packages/enlightenment.git] / enlightenment-ac_am_fixes.patch

diff --git a/enlightenment-ac_am_fixes.patch b/enlightenment-ac_am_fixes.patch
index 4844dcdbd68460ce982003fdd20102eeb10ce791..3a582f2f5ef54376eb8d2106ba453c6be71a17b7 100644 (file)
--- a/enlightenment-ac_am_fixes.patch
+++ b/enlightenment-ac_am_fixes.patch
@@ -1,6 +1,6 @@
-diff -Nur enlightenment-0.16.7.1.orig/config/Makefile.am enlightenment-0.16.7.1/config/Makefile.am
---- enlightenment-0.16.7.1.orig/config/Makefile.am     2004-07-12 21:41:53.000000000 +0200
-+++ enlightenment-0.16.7.1/config/Makefile.am  2004-10-09 20:19:33.830189704 +0200
+diff -urd e16-0.16.8.1/config/Makefile.am e16-0.16.8.1.edirconf/config/Makefile.am
+--- e16-0.16.8.1/config/Makefile.am    2006-03-18 22:58:14.000000000 +0100
++++ e16-0.16.8.1.edirconf/config/Makefile.am   2006-07-17 22:09:56.000000000 +0200
 @@ -1,6 +1,6 @@
  SUBDIRS = pix
  
@@ -10,32 +10,32 @@ diff -Nur enlightenment-0.16.7.1.orig/config/Makefile.am enlightenment-0.16.7.1/
  backup-borders.cfg \
  backup-colormodifiers.cfg \
 @@ -14,10 +14,10 @@
- keybindings.cfg \
- menus.cfg
+ menus.cfg \
+ e16keyedit.db
  
 -configdatadir = $(ENLIGHTENMENT_ROOT)/config
 +configdatadir = $(sysconfdir)
  
- TRANSLATIONS = config.ja config.pl config.ko
+ TRANSLATIONS = # config.ja config.pl config.ko
 -EXTRA_DIST = $(configdata_DATA) $(TRANSLATIONS) strings.c
 +EXTRA_DIST = $(sysconf_DATA) $(TRANSLATIONS) strings.c
  
- install-data-local:
+ no-install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(configdatadir)
-diff -Nur enlightenment-0.16.7.1.orig/config/pix/Makefile.am enlightenment-0.16.7.1/config/pix/Makefile.am
---- enlightenment-0.16.7.1.orig/config/pix/Makefile.am 2003-07-15 07:46:24.000000000 +0200
-+++ enlightenment-0.16.7.1/config/pix/Makefile.am      2004-10-09 20:19:33.832189400 +0200
+diff -urd e16-0.16.8.1/config/pix/Makefile.am e16-0.16.8.1.edirconf/config/pix/Makefile.am
+--- e16-0.16.8.1/config/pix/Makefile.am        2003-07-15 07:46:24.000000000 +0200
++++ e16-0.16.8.1.edirconf/config/pix/Makefile.am       2006-07-17 22:06:17.000000000 +0200
 @@ -1,4 +1,4 @@
 -epixdir = $(ENLIGHTENMENT_ROOT)/config/pix
 +epixdir = $(sysconfdir)/pix
  
  epix_DATA = wait1.png wait2.png wait3.png wait4.png \
              wait5.png wait6.png wait7.png wait8.png \
-diff -Nur enlightenment-0.16.7.1.orig/configure.in enlightenment-0.16.7.1/configure.in
---- enlightenment-0.16.7.1.orig/configure.in   2004-08-13 21:18:28.000000000 +0200
-+++ enlightenment-0.16.7.1/configure.in        2004-10-09 20:20:06.645201064 +0200
+diff -urd e16-0.16.8.1/configure.in e16-0.16.8.1.edirconf/configure.in
+--- e16-0.16.8.1/configure.in  2006-03-28 19:53:50.000000000 +0200
++++ e16-0.16.8.1.edirconf/configure.in 2006-07-17 22:11:57.000000000 +0200
 @@ -30,7 +30,7 @@
- AC_DEFINE_UNQUOTED(ENLIGHTENMENT_RELEASE, "$ENLIGHTENMENT_RELEASE", [Release])
+   AC_DEFINE_UNQUOTED(ENLIGHTENMENT_RELEASE, "$ENLIGHTENMENT_RELEASE", [Release])
  fi
  
 -ALL_LINGUAS="bg bs da de en_US es fr hu ko nl no ru sv pt pl pt_BR tr ja"
@@ -43,17 +43,18 @@ diff -Nur enlightenment-0.16.7.1.orig/configure.in enlightenment-0.16.7.1/config
  
  AC_PROG_CC
  AC_PROG_MAKE_SET
-@@ -70,9 +70,6 @@
-   AC_SUBST(LIBINTL)
- fi
+@@ -68,10 +68,6 @@
+ AM_GNU_GETTEXT
+ AM_GNU_GETTEXT_VERSION(0.12.1)
  
 -AC_ARG_ENABLE(fsstd,
--  [  --enable-fsstd          install files following FSSTD [default=no]], ,enable_fsstd=no)
+-  [  --enable-fsstd          install files following FSSTD @<:@default=yes@:>@],,
+-  enable_fsstd=yes)
 -
  AC_ARG_ENABLE(sound,
-   [  --enable-sound          compile with sound support [default=yes]], ,enable_sound=yes)
- 
-@@ -89,20 +86,16 @@
+   [  --enable-sound          compile with sound support @<:@default=yes@:>@],,
+   enable_sound=yes)
+@@ -92,20 +88,16 @@
  dnl The following test must come after AM_GNU_GETTEXT as it relies on
  dnl ${DATADIRNAME} being defined.
  
@@ -61,10 +62,10 @@ diff -Nur enlightenment-0.16.7.1.orig/configure.in enlightenment-0.16.7.1/config
 -  LOCALEDIR=${prefix}/${DATADIRNAME}/locale
 -else
 -  datadir=${prefix}
--  exec_prefix=${prefix}/enlightenment
--  LOCALEDIR=${prefix}/enlightenment/locale
+-  exec_prefix=${prefix}/e16
+-  LOCALEDIR=${prefix}/e16/locale
 -fi
- ENLIGHTENMENT_ROOT=`eval echo ${datadir}/enlightenment`
+ ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
  ENLIGHTENMENT_BIN=`eval echo ${bindir}`
 +ENLIGHTENMENT_CONF=`eval echo ${sysconfdir}`
  AC_SUBST(ENLIGHTENMENT_ROOT)