[pl] Use make install method for installation
Petr Pisar
ppisar at fedoraproject.org
Thu Dec 16 15:43:09 UTC 2010
commit 7b31bfb49f6ec0f798a06ae472085fb4d1234aa5
Author: Petr Písař <ppisar at redhat.com>
Date: Wed Dec 15 10:32:03 2010 +0100
Use make install method for installation
pl.spec | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/pl.spec b/pl.spec
index c1ce4f4..f98ec85 100644
--- a/pl.spec
+++ b/pl.spec
@@ -168,8 +168,11 @@ export JAVA_LIB=$JAVA_HOME/jre/lib/%{_arch}
export DISABLE_PKGS="jpl"
%endif
+# Build interpreter needed for SWI packages compilation
%configure --enable-shared LDFLAGS="-Wl,--enable-new-dtags"
make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+
+# Build SWI packages
pushd packages
%configure LDFLAGS="-Wl,--enable-new-dtags"
make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" JAVALIBS="-L$JAVA_LIB/server -L$JAVA_LIB -ljava -lverify -ljvm"
@@ -178,18 +181,13 @@ popd
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
-%makeinstall
+#mkdir -p $RPM_BUILD_ROOT%{_prefix}
+make install DESTDIR=$RPM_BUILD_ROOT
# Library must be executable to get its debuginfo
#chmod 0755 $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/lib/*/libswipl.so.*
pushd packages
-PATH=$RPM_BUILD_ROOT/usr/bin:$PATH make rpm-install \
- PLBASE=$RPM_BUILD_ROOT%{_libdir}/swipl-%{version} \
- prefix=$RPM_BUILD_ROOT%{_prefix} \
- bindir=$RPM_BUILD_ROOT%{_bindir} \
- libdir=$RPM_BUILD_ROOT%{_libdir} \
- mandir=$RPM_BUILD_ROOT%{_mandir}/man1
+make install DESTDIR=$RPM_BUILD_ROOT
# Do not chmod earlier, the run.sh's are executed
chmod -x jpl/examples/java/*/run.sh
popd
@@ -308,6 +306,7 @@ rm -rf $RPM_BUILD_ROOT
- Adjust jni.patch to 5.10.2
- Adjust pc.patch to 5.10.2
- Fix pl2xpce.so location
+- Use make install method for installation
* Wed Dec 8 2010 Petr Pisar <ppisar at redhar.com> - 5.7.11-6
- Inhibit XPCE by macro to silent rpmlint
More information about the scm-commits
mailing list