[E-devel] patch for engage and e_modules

Marcus Hüwe Mon, 24 Jul 2006 07:46:59 -0700

Hi,

i noticed that engage and e_modules won't be installed properly on x86_64
machines. I had a look at the configure scripts and there's something
wrong.
For example the e_modules package will be installed in this directory


datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"

but that's not correct if you build on x86_64 (see attached patches).

Why isn't the "enlightenment-config --module-dir"-path used for such
"external" modules?


Cheers Marcus

--- configure.in.old	2006-07-24 15:41:43.000000000 +0200
+++ configure.in	2006-07-24 15:43:20.000000000 +0200
@@ -63,7 +63,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.

diff -Naur e_modules-0.0.1-cvs20060723.old/bling/configure.in e_modules-0.0.1-cvs20060723/bling/configure.in
--- e_modules-0.0.1-cvs20060723.old/bling/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/bling/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -83,7 +83,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/calendar/configure.in e_modules-0.0.1-cvs20060723/calendar/configure.in
--- e_modules-0.0.1-cvs20060723.old/calendar/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/calendar/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -87,7 +87,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/cpu/configure.in e_modules-0.0.1-cvs20060723/cpu/configure.in
--- e_modules-0.0.1-cvs20060723.old/cpu/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/cpu/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -87,7 +87,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/deskshow/configure.in e_modules-0.0.1-cvs20060723/deskshow/configure.in
--- e_modules-0.0.1-cvs20060723.old/deskshow/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/deskshow/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -82,7 +82,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 	  
 #AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
diff -Naur e_modules-0.0.1-cvs20060723.old/devian/configure.in e_modules-0.0.1-cvs20060723/devian/configure.in
--- e_modules-0.0.1-cvs20060723.old/devian/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/devian/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -121,7 +121,7 @@
 if test "x${prefix}" = "xNONE"; then
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 
diff -Naur e_modules-0.0.1-cvs20060723.old/eveil/configure.in e_modules-0.0.1-cvs20060723/eveil/configure.in
--- e_modules-0.0.1-cvs20060723.old/eveil/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/eveil/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -91,7 +91,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/flame/configure.in e_modules-0.0.1-cvs20060723/flame/configure.in
--- e_modules-0.0.1-cvs20060723.old/flame/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/flame/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -87,7 +87,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/language/configure.in e_modules-0.0.1-cvs20060723/language/configure.in
--- e_modules-0.0.1-cvs20060723.old/language/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/language/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -87,7 +87,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/mail/configure.in e_modules-0.0.1-cvs20060723/mail/configure.in
--- e_modules-0.0.1-cvs20060723.old/mail/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/mail/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -82,7 +82,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 	  
 #AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
diff -Naur e_modules-0.0.1-cvs20060723.old/mbar/configure.in e_modules-0.0.1-cvs20060723/mbar/configure.in
--- e_modules-0.0.1-cvs20060723.old/mbar/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/mbar/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -103,7 +103,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 	  
 #AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
diff -Naur e_modules-0.0.1-cvs20060723.old/mem/configure.in e_modules-0.0.1-cvs20060723/mem/configure.in
--- e_modules-0.0.1-cvs20060723.old/mem/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/mem/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -106,7 +106,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/net/configure.in e_modules-0.0.1-cvs20060723/net/configure.in
--- e_modules-0.0.1-cvs20060723.old/net/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/net/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -87,7 +87,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/photo/configure.in e_modules-0.0.1-cvs20060723/photo/configure.in
--- e_modules-0.0.1-cvs20060723.old/photo/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/photo/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -91,7 +91,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/rain/configure.in e_modules-0.0.1-cvs20060723/rain/configure.in
--- e_modules-0.0.1-cvs20060723.old/rain/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/rain/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -87,7 +87,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/screenshot/configure.in e_modules-0.0.1-cvs20060723/screenshot/configure.in
--- e_modules-0.0.1-cvs20060723.old/screenshot/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/screenshot/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -90,7 +90,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 	  
 #AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
diff -Naur e_modules-0.0.1-cvs20060723.old/slideshow/configure.in e_modules-0.0.1-cvs20060723/slideshow/configure.in
--- e_modules-0.0.1-cvs20060723.old/slideshow/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/slideshow/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -88,7 +88,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/snow/configure.in e_modules-0.0.1-cvs20060723/snow/configure.in
--- e_modules-0.0.1-cvs20060723.old/snow/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/snow/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -87,7 +87,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/taskbar/configure.in e_modules-0.0.1-cvs20060723/taskbar/configure.in
--- e_modules-0.0.1-cvs20060723.old/taskbar/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/taskbar/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -98,7 +98,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/tclock/configure.in e_modules-0.0.1-cvs20060723/tclock/configure.in
--- e_modules-0.0.1-cvs20060723.old/tclock/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/tclock/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -35,7 +35,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/uptime/configure.in e_modules-0.0.1-cvs20060723/uptime/configure.in
--- e_modules-0.0.1-cvs20060723.old/uptime/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/uptime/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -90,7 +90,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/weather/configure.in e_modules-0.0.1-cvs20060723/weather/configure.in
--- e_modules-0.0.1-cvs20060723.old/weather/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/weather/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -87,7 +87,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)
diff -Naur e_modules-0.0.1-cvs20060723.old/wlan/configure.in e_modules-0.0.1-cvs20060723/wlan/configure.in
--- e_modules-0.0.1-cvs20060723.old/wlan/configure.in	2006-07-24 15:53:30.000000000 +0200
+++ e_modules-0.0.1-cvs20060723/wlan/configure.in	2006-07-24 15:54:57.000000000 +0200
@@ -87,7 +87,7 @@
     datadir="${HOME}/.e/e/modules/${PACKAGE}"
 else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination")
-    datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"    
+    datadir="${libdir}/enlightenment/modules/${PACKAGE}"    
 fi
 
 AC_PREFIX_DEFAULT(${HOME}/.e/e)

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

[E-devel] patch for engage and e_modules

Reply via email to