Changeset 1764 for trunk

Timestamp:

16/11/11 19:27:56 (6 months ago)

Author:

Freddie Akeroyd

Message:

Alternative fix for --prefix refs #303

Location:

trunk

Files:

• build_rpm.in (modified) (1 diff)
• nexus_spec.in (modified) (1 diff)

trunk/build_rpm.in

@@ -34 +34 @@
 fi
 # buildroot is actually where we install to
-# need to make sure either there is no --prefix in $build_args or it is /usr
-env NEXUS_CONFIG_OPTIONS="$build_args --prefix=/usr" rpmbuild -ba --buildroot $nxtop/installroot --define "_source_filedigest_algorithm md5" --define "_binary_filedigest_algorithm md5" nexus.spec
+env NEXUS_CONFIG_OPTIONS="$build_args" rpmbuild -ba --buildroot $nxtop/installroot --define "_source_filedigest_algorithm md5" --define "_binary_filedigest_algorithm md5" nexus.spec

trunk/nexus_spec.in

@@ -87 +87 @@
 %build
 # RPM_INSTALL_PREFIX - where to install software
+# do --prefix last in case also present in passed config options
 if ! test -z "$RPM_INSTALL_PREFIX"; then
-    ./configure --prefix="$RPM_INSTALL_PREFIX" $NEXUS_CONFIG_OPTIONS
+    ./configure $NEXUS_CONFIG_OPTIONS --prefix="$RPM_INSTALL_PREFIX"
 else
-    ./configure --prefix=%{_prefix} --libdir=%{_libdir} $NEXUS_CONFIG_OPTIONS
+    ./configure $NEXUS_CONFIG_OPTIONS --prefix=%{_prefix} --libdir=%{_libdir}
 fi
 make