Enlightenment CVS committal

Author  : mej
Project : e17
Module  : libs/epeg

Dir     : e17/libs/epeg


Modified Files:
        configure.in epeg.spec 


Log Message:
Mon Jan  3 22:36:05 2005                        Michael Jennings (mej)

Spec file updates.

Don't override --bindir and --libdir.
----------------------------------------------------------------------

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/epeg/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- configure.in        20 Jan 2004 00:53:41 -0000      1.3
+++ configure.in        4 Jan 2005 03:36:33 -0000       1.4
@@ -18,31 +18,35 @@
 AC_CHECK_FUNCS(fmemopen)
 AC_CHECK_FUNCS(open_memstream)
 
-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";
-  else
-    bindir="${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
+    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";
-  else
-    libdir="${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
+    if test "x${prefix}" = "xNONE"; then
+      libdir="${ac_default_prefix}/lib";
+    else
+      libdir="${prefix}/lib";
+    fi
   fi
 fi
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/epeg/epeg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- epeg.spec   25 Jul 2004 21:50:38 -0000      1.4
+++ epeg.spec   4 Jan 2005 03:36:39 -0000       1.5
@@ -4,13 +4,15 @@
 Name: epeg
 Version: 0.9.0
 Release: 1.%(date '+%Y%m%d')
-Copyright: BSD
+License: BSD
 Group: System Environment/Libraries
-Source: ftp://ftp.enlightenment.org/pub/epeg/%{name}-%{version}.tar.gz
-Packager: Michael Jennings <[EMAIL PROTECTED]
 URL: http://www.enlightenment.org/
-#BuildSuggests: libjpeg-devel xorg-x11-devel
-Requires: libjpeg
+Source: ftp://ftp.enlightenment.org/pub/epeg/%{name}-%{version}.tar.gz
+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
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description




-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to