Changeset 1227

Timestamp:

14/04/09 18:34:02 (3 years ago)

Author:

Freddie Akeroyd

Message:

Change default rpm install to %{_libdir} refs #115.

File:

• trunk/nexus_spec.in (modified) (5 diffs)

trunk/nexus_spec.in

@@ -24 +24 @@
 # Prefix allows our package to be relocatable i.e. installable in 
 # other than just the /usr/local directory
-Prefix: /usr/local
+#Prefix: /usr
 # BuildRoot is the root for software installation
 # this value will not usually be used, but something must
@@ -37 +37 @@
 access routines, documentation, examples and a basic NeXus file browser.
 
+#%package devel
+#Summary: Libraries and utilities for using NeXus format data files
+#Group: Development/Libraries
+#
+#%description devel
+#NeXus is an international standard for exchanging data files
+#among Neutron, Muon and X-ray science facilities. The underlying
+#data is stored using the HDF format from NCSA. This package provides
+
 %prep
 %setup -q
@@ -45 +54 @@
     ./configure --prefix="$RPM_INSTALL_PREFIX" $NEXUS_CONFIG_OPTIONS
 else
-    ./configure --prefix=/usr/local $NEXUS_CONFIG_OPTIONS
+    ./configure --prefix=%{_prefix} --libdir=%{_libdir} $NEXUS_CONFIG_OPTIONS
 fi
 make
@@ -58 +67 @@
 %doc README NEWS ChangeLog AUTHORS COPYING INSTALL
 # %docdir /usr/local/doc
-/usr/local/lib
-/usr/local/bin
-/usr/local/include
-/usr/local/share
+%{_libdir}/*
+%{_bindir}/*
+%{_datadir}/*
+%{_includedir}/*
+#%files devel
+#%{_libdir}/*.a
+#%{_libdir}/*.so*
 
 %clean
@@ -70 +82 @@
     INSTALL_PREFIX=$RPM_INSTALL_PREFIX
 else
-    INSTALL_PREFIX=/usr/local
+    INSTALL_PREFIX=%{_prefix}
 fi
 ( cd $INSTALL_PREFIX/bin; for i in nxbuild; do \