summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2008-10-16 10:19:40 +0000
committerCedric BAIL <cedric.bail@free.fr>2008-10-16 10:19:40 +0000
commitdab9aaa5c51a15959aecb4e98496d5ba179c2f86 (patch)
treee7d93177d5ccfed5d86e7ae5fdd9f22426247977
parent53035602623cac8f08fd7494d21382c0c4a5069b (diff)
Remove enlightenment-config source of miscompilation. You should use pkg-config now.
SVN revision: 36712
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac3
-rw-r--r--data/other/enlightenment_remote4
-rw-r--r--debian/e17-dev.install1
-rw-r--r--debian/rules1
-rw-r--r--enlightenment-config.in65
-rw-r--r--enlightenment.spec.in1
7 files changed, 2 insertions, 75 deletions
diff --git a/Makefile.am b/Makefile.am
index 925ce83dc..8df5af8f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,6 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
6 stamp-h.in acconfig.h \ 6 stamp-h.in acconfig.h \
7 enlightenment.spec enlightenment.pc 7 enlightenment.spec enlightenment.pc
8 8
9bin_SCRIPTS = enlightenment-config
10
11EXTRA_DIST = config.rpath README AUTHORS COPYING COPYING-PLAIN \ 9EXTRA_DIST = config.rpath README AUTHORS COPYING COPYING-PLAIN \
12 enlightenment.spec.in enlightenment.spec enlightenment.pc 10 enlightenment.spec.in enlightenment.spec enlightenment.pc
13 11
diff --git a/configure.ac b/configure.ac
index 8f9f9d347..5561e22c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -458,7 +458,4 @@ doc/Makefile
458config/Makefile 458config/Makefile
459config/default/Makefile 459config/default/Makefile
460po/Makefile.in 460po/Makefile.in
461enlightenment-config
462],[
463chmod +x enlightenment-config
464]) 461])
diff --git a/data/other/enlightenment_remote b/data/other/enlightenment_remote
index e25abef53..cb0f44b03 100644
--- a/data/other/enlightenment_remote
+++ b/data/other/enlightenment_remote
@@ -233,8 +233,8 @@ _enlightenment_remote() {
233 return 0 233 return 0
234 ;; 234 ;;
235 -module-load) 235 -module-load)
236 extra_dir=$(enlightenment-config --module-dir) 236 extra_dir=$(pkg-config --variable=modules enlightenment)
237 # This is a hack. enlightenment-config should return extra dir and standard dir 237 # This is a hack. pkg-config should return extra dir and standard dir
238 dir=${extra_dir%_extra} 238 dir=${extra_dir%_extra}
239 modules=$(cd ${dir} && /bin/ls && cd ${extra_dir} && /bin/ls) 239 modules=$(cd ${dir} && /bin/ls && cd ${extra_dir} && /bin/ls)
240 COMPREPLY=($(compgen -W "${modules}" -- "${cur}")) 240 COMPREPLY=($(compgen -W "${modules}" -- "${cur}"))
diff --git a/debian/e17-dev.install b/debian/e17-dev.install
index b591f85f8..97f88c717 100644
--- a/debian/e17-dev.install
+++ b/debian/e17-dev.install
@@ -1,2 +1 @@
1debian/tmp/usr/bin/enlightenment-config
2debian/tmp/usr/include/enlightenment/*.h debian/tmp/usr/include/enlightenment/*.h
diff --git a/debian/rules b/debian/rules
index a97c66c6b..fad640933 100644
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
7DEB_FIXPERMS_EXCLUDE := enlightenment_sys freqset tempget batget 7DEB_FIXPERMS_EXCLUDE := enlightenment_sys freqset tempget batget
8DEB_MAKE_CLEAN_TARGET := clean 8DEB_MAKE_CLEAN_TARGET := clean
9DEB_INSTALL_MANPAGES_e17 := $(DEB_SRCDIR)/debian/enlightenment.1 $(DEB_SRCDIR)/debian/enlightenment_*.1 9DEB_INSTALL_MANPAGES_e17 := $(DEB_SRCDIR)/debian/enlightenment.1 $(DEB_SRCDIR)/debian/enlightenment_*.1
10DEB_INSTALL_MANPAGES_e17-dev := $(DEB_SRCDIR)/debian/enlightenment-config.1
11DEB_DH_STRIP_ARGS := --dbg-package=e17-dbg 10DEB_DH_STRIP_ARGS := --dbg-package=e17-dbg
12DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath 11DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath
13 12
diff --git a/enlightenment-config.in b/enlightenment-config.in
deleted file mode 100644
index 9c2207ba0..000000000
--- a/enlightenment-config.in
+++ /dev/null
@@ -1,65 +0,0 @@
1#!/bin/sh
2
3prefix=@prefix@
4exec_prefix=@exec_prefix@
5exec_prefix_set=no
6
7usage="\
8Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
9
10if test $# -eq 0; then
11 echo "${usage}" 1>&2
12 exit 1
13fi
14
15while test $# -gt 0; do
16 case "$1" in
17 -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
18 *) optarg= ;;
19 esac
20
21 case $1 in
22 --prefix=*)
23 prefix=$optarg
24 if test $exec_prefix_set = no ; then
25 exec_prefix=$optarg
26 fi
27 ;;
28 --prefix)
29 echo $prefix
30 ;;
31 --exec-prefix=*)
32 exec_prefix=$optarg
33 exec_prefix_set=yes
34 ;;
35 --exec-prefix)
36 echo $exec_prefix
37 ;;
38 --version)
39 echo @VERSION@
40 ;;
41 --cflags)
42 includes="-I@prefix@/include/enlightenment"
43 echo $includes @e_cflags@
44 ;;
45 --libs)
46 libdirs="-L@libdir@"
47 echo $libdirs
48 ;;
49 --module-dir)
50 dir="@libdir@/@PACKAGE@/modules"
51 echo $dir
52 ;;
53 --config-apps-dir)
54 dir="@prefix@/share/@PACKAGE@/config-apps"
55 echo $dir
56 ;;
57 *)
58 echo "${usage}" 1>&2
59 exit 1
60 ;;
61 esac
62 shift
63done
64
65exit 0
diff --git a/enlightenment.spec.in b/enlightenment.spec.in
index e6bdc78b5..99a360e1f 100644
--- a/enlightenment.spec.in
+++ b/enlightenment.spec.in
@@ -68,7 +68,6 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
68 68
69%files devel 69%files devel
70%defattr(-, root, root) 70%defattr(-, root, root)
71%{_bindir}/enlightenment-config
72%{_includedir}/enlightenment 71%{_includedir}/enlightenment
73%{_libdir}/pkgconfig/*.pc 72%{_libdir}/pkgconfig/*.pc
74 73