Enlightenment CVS committal
Author : mej
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
configure.in ecore.spec
Log Message:
Wed Jan 5 00:03:30 2005 Michael Jennings (mej)
Assorted spec file cleanups.
Do not override --bindir and --libdir (breaks x86_64).
Some of these are still untested, so please be patient.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/configure.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- configure.in 4 Jan 2005 14:22:04 -0000 1.68
+++ configure.in 5 Jan 2005 05:05:26 -0000 1.69
@@ -17,31 +17,35 @@
AM_ENABLE_SHARED
AM_PROG_LIBTOOL
-if test "x${exec_prefix}" = "xNONE"; then
- if test "x${prefix}" = "xNONE"; then
- bindir="${ac_default_prefix}/bin";
- else
- bindir="${prefix}/bin";
- fi
-else
- if test "x${prefix}" = "xNONE"; then
- bindir="${ac_default_prefix}/bin";
+if test "x${bindir}" = 'x${exec_prefix}/bin'; then
+ if test "x${exec_prefix}" = "xNONE"; then
+ if test "x${prefix}" = "xNONE"; then
+ bindir="${ac_default_prefix}/bin";
+ else
+ bindir="${prefix}/bin";
+ fi
else
- bindir="${prefix}/bin";
+ if test "x${prefix}" = "xNONE"; then
+ bindir="${ac_default_prefix}/bin";
+ else
+ bindir="${prefix}/bin";
+ fi
fi
fi
-if test "x${exec_prefix}" = "xNONE"; then
- if test "x${prefix}" = "xNONE"; then
- libdir="${ac_default_prefix}/lib";
- else
- libdir="${prefix}/lib";
- fi
-else
- if test "x${prefix}" = "xNONE"; then
- libdir="${ac_default_prefix}/lib";
+if test "x${libdir}" = 'x${exec_prefix}/lib'; then
+ if test "x${exec_prefix}" = "xNONE"; then
+ if test "x${prefix}" = "xNONE"; then
+ libdir="${ac_default_prefix}/lib";
+ else
+ libdir="${prefix}/lib";
+ fi
else
- libdir="${prefix}/lib";
+ if test "x${prefix}" = "xNONE"; then
+ libdir="${ac_default_prefix}/lib";
+ else
+ libdir="${prefix}/lib";
+ fi
fi
fi
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/ecore.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ecore.spec 25 Jul 2004 21:50:37 -0000 1.15
+++ ecore.spec 5 Jan 2005 05:05:26 -0000 1.16
@@ -4,12 +4,16 @@
Name: ecore
Version: 1.0.0
Release: 0.pre7.%(date '+%Y%m%d')
-Copyright: BSD
+License: BSD
Group: User Interface/X
Source:
ftp://ftp.enlightenment.org/enlightenment/%{name}-%{version}_pre7.tar.gz
URL: http://www.enlightenment.org/efm.html
-Packager: Michael Jennings <[EMAIL PROTECTED]>
-#BuildSuggests: openssl-devel evas-devel xorg-x11-devel
+Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <[EMAIL
PROTECTED]>}
+Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment
Project (http://www.enlightenment.org/)}
+Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
+#BuildSuggests: xorg-x11-devel
+BuildRequires: libjpeg-devel XFree86-devel openssl-devel
+BuildRequires: evas-devel edb-devel eet-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
@@ -22,6 +26,8 @@
Summary: Ecore headers and development libraries.
Group: Development/Libraries
Requires: %{name} = %{version}
+Requires: libjpeg-devel XFree86-devel openssl-devel
+Requires: evas-devel edb-devel eet-devel
%description devel
Ecore development files
@@ -30,6 +36,9 @@
%setup -q -n %{name}-%{version}_pre7
%build
+CFLAGS="-I/usr/kerberos/include"
+LDFLAGS="-L/usr/kerberos/lib"
+export CFLAGS LDFLAGS
%{configure} --prefix=%{_prefix}
%{__make} %{?_smp_mflags} %{?mflags}
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
