- rm -f SIGSEGV ;)

- use /etc/X11/enlightenment as the directory for config files

Changed files:
    e16-ac_am_fixes.patch -> 1.2
    enlightenment-ac_am_fixes.patch -> 1.2
    enlightenment-config-path.patch -> 1.5

diff --git a/e16-ac_am_fixes.patch b/e16-ac_am_fixes.patch
index 447d017aed92aaf0920704ed34c60dcbf16e46ba..8370c4b674d3479f687a1af3f445cb87f8114712 100644 (file)
--- a/e16-ac_am_fixes.patch
+++ b/e16-ac_am_fixes.patch
@@ -249,7 +249,7 @@ diff -Nru enlightenment-0.16.5/src/Makefile.am enlightenment-0.16.5.new/src/Make
 -#         $(LN_S) $(bindir)/$$i $(exec_prefix)/bin/$$i; \
 -#       done; \
 -#     fi
-+DEFS=-DENLIGHTENMENT_ROOT=\"$(pkgdatadir)\" -DENLIGHTENMENT_BIN=\"$(bindir)\" -DLOCALEDIR=\"$(datadir)/locale\" -DCONFIGDATADIR=\"$(sysconfdir)/config\"
++DEFS=-DENLIGHTENMENT_ROOT=\"$(pkgdatadir)\" -DENLIGHTENMENT_BIN=\"$(bindir)\" -DLOCALEDIR=\"$(datadir)/locale\" -DCONFIGDATADIR=\"$(sysconfdir)\"
  
  install-data-local:
 -      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes; \
@@ -306,7 +306,7 @@ diff -Nru enlightenment-0.16.5/src/themes/configs/Makefile.am enlightenment-0.16
  
  install-data-local:
 -      $(mkinstalldirs) $(DESTDIR)$(configdatadir)
-+      $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/config
++      $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
  
  # Japanese
 -      gzip -d -c < $(srcdir)/config.ja | (cd $(DESTDIR)$(configdatadir); tar -xmf -)
@@ -320,7 +320,7 @@ diff -Nru enlightenment-0.16.5/src/themes/configs/backup/Makefile.am enlightenme
 -else
 -ebackupdir = $(prefix)/enlightenment/config/backup
 -endif
-+ebackupdir = $(sysconfdir)/config/backup
++ebackupdir = $(sysconfdir)/backup
  
  ebackup_DATA = 
  
@@ -333,7 +333,7 @@ diff -Nru enlightenment-0.16.5/src/themes/configs/pix/Makefile.am enlightenment-
 -else
 -epixdir = $(prefix)/enlightenment/config/pix
 -endif
-+epixdir = $(sysconfdir)/config/pix
++epixdir = $(sysconfdir)/pix
  
  epix_DATA = wait1.png wait2.png wait3.png wait4.png \
              wait5.png wait6.png wait7.png wait8.png \

diff --git a/enlightenment-ac_am_fixes.patch b/enlightenment-ac_am_fixes.patch
index 447d017aed92aaf0920704ed34c60dcbf16e46ba..8370c4b674d3479f687a1af3f445cb87f8114712 100644 (file)
--- a/enlightenment-ac_am_fixes.patch
+++ b/enlightenment-ac_am_fixes.patch
@@ -249,7 +249,7 @@ diff -Nru enlightenment-0.16.5/src/Makefile.am enlightenment-0.16.5.new/src/Make
 -#         $(LN_S) $(bindir)/$$i $(exec_prefix)/bin/$$i; \
 -#       done; \
 -#     fi
-+DEFS=-DENLIGHTENMENT_ROOT=\"$(pkgdatadir)\" -DENLIGHTENMENT_BIN=\"$(bindir)\" -DLOCALEDIR=\"$(datadir)/locale\" -DCONFIGDATADIR=\"$(sysconfdir)/config\"
++DEFS=-DENLIGHTENMENT_ROOT=\"$(pkgdatadir)\" -DENLIGHTENMENT_BIN=\"$(bindir)\" -DLOCALEDIR=\"$(datadir)/locale\" -DCONFIGDATADIR=\"$(sysconfdir)\"
  
  install-data-local:
 -      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes; \
@@ -306,7 +306,7 @@ diff -Nru enlightenment-0.16.5/src/themes/configs/Makefile.am enlightenment-0.16
  
  install-data-local:
 -      $(mkinstalldirs) $(DESTDIR)$(configdatadir)
-+      $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/config
++      $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
  
  # Japanese
 -      gzip -d -c < $(srcdir)/config.ja | (cd $(DESTDIR)$(configdatadir); tar -xmf -)
@@ -320,7 +320,7 @@ diff -Nru enlightenment-0.16.5/src/themes/configs/backup/Makefile.am enlightenme
 -else
 -ebackupdir = $(prefix)/enlightenment/config/backup
 -endif
-+ebackupdir = $(sysconfdir)/config/backup
++ebackupdir = $(sysconfdir)/backup
  
  ebackup_DATA = 
  
@@ -333,7 +333,7 @@ diff -Nru enlightenment-0.16.5/src/themes/configs/pix/Makefile.am enlightenment-
 -else
 -epixdir = $(prefix)/enlightenment/config/pix
 -endif
-+epixdir = $(sysconfdir)/config/pix
++epixdir = $(sysconfdir)/pix
  
  epix_DATA = wait1.png wait2.png wait3.png wait4.png \
              wait5.png wait6.png wait7.png wait8.png \

diff --git a/enlightenment-config-path.patch b/enlightenment-config-path.patch
index 8a86e39a0d9fba015f6cad08e9094f76ad8abfbd..bedbabb4ef0b9b7a5cf5fe7f832ad6ee532944f5 100644 (file)
--- a/enlightenment-config-path.patch
+++ b/enlightenment-config-path.patch
@@ -1,15 +1,3 @@
-diff -Nru enlightenment-0.16.5/src/Makefile.in enlightenment-0.16.5.new/src/Makefile.in
---- enlightenment-0.16.5/src/Makefile.in       Sun Oct  1 06:58:42 2000
-+++ enlightenment-0.16.5.new/src/Makefile.in   Sun Oct  1 05:28:39 2000
-@@ -127,7 +127,7 @@
- 
- 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@\"
-+DEFS = -DENLIGHTENMENT_ROOT=\"@ENLIGHTENMENT_ROOT@\" -DENLIGHTENMENT_BIN=\"@ENLIGHTENMENT_BIN@\" -DLOCALEDIR=\"@LOCALEDIR@\" -DCONFIGDATADIR=\"$(configdatadir)\"
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../econfig.h
- CONFIG_CLEAN_FILES = 
 diff -Nru enlightenment-0.16.5/src/config.c enlightenment-0.16.5.new/src/config.c
 --- enlightenment-0.16.5/src/config.c  Sun Oct  1 06:58:42 2000
 +++ enlightenment-0.16.5.new/src/config.c      Sun Oct  1 07:03:53 2000
@@ -18,7 +6,7 @@ diff -Nru enlightenment-0.16.5/src/config.c enlightenment-0.16.5.new/src/config.
        Esnprintf(execline, sizeof(execline), "%s " "-P " "-nostdinc " "-undef "
  #ifndef __EMX__
 -                "-include %s/config/definitions " "-I%s " "-I%s/config "
-+                "-include %s/config/definitions " "-I%s "
++                "-include %s/definitions " "-I%s " "-I%s "
                  "-D ENLIGHTENMENT_VERSION=%s " "-D ENLIGHTENMENT_ROOT=%s "
                  "-D ENLIGHTENMENT_BIN=%s "
  #else