X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=pazpar2.spec;h=13b578fdf7965c90bd2733f155e547dc93e72231;hb=17ef116432f19c9229f95d4708221adb20d64b69;hp=e1c9d12dfa6a15b5fb0f3ee3dde9343e354925d3;hpb=18543f152ceb7672424ff35e35adc8716cde4598;p=pazpar2-moved-to-github.git

diff --git a/pazpar2.spec b/pazpar2.spec
index e1c9d12..13b578f 100644
--- a/pazpar2.spec
+++ b/pazpar2.spec
@@ -71,8 +71,7 @@ make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -fr ${RPM_BUILD_ROOT}
-make prefix=${RPM_BUILD_ROOT}/%{_prefix} mandir=${RPM_BUILD_ROOT}/%{_mandir} \
-	libdir=${RPM_BUILD_ROOT}/%{_libdir} install
+make install DESTDIR=${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}/etc/pazpar2
 mkdir -p ${RPM_BUILD_ROOT}/etc/pazpar2/settings
 mkdir -p ${RPM_BUILD_ROOT}/etc/pazpar2/services-enabled
@@ -81,6 +80,7 @@ cp etc/server.xml ${RPM_BUILD_ROOT}/etc/pazpar2/
 cp etc/default.xml ${RPM_BUILD_ROOT}/etc/pazpar2/services-available/
 cp etc/services/*.xml ${RPM_BUILD_ROOT}/etc/pazpar2/services-available/
 cp etc/settings/*.xml ${RPM_BUILD_ROOT}/etc/pazpar2/settings/
+cp -r etc/settings/mkc ${RPM_BUILD_ROOT}/etc/pazpar2/settings
 cp etc/*.xsl ${RPM_BUILD_ROOT}/etc/pazpar2/
 mkdir -p ${RPM_BUILD_ROOT}/etc/rc.d/init.d
 install -m755 rpm/pazpar2.init ${RPM_BUILD_ROOT}/etc/rc.d/init.d/pazpar2
@@ -97,11 +97,13 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_sbindir}/pazpar2
 %dir %{_sysconfdir}/pazpar2
 %dir %{_sysconfdir}/pazpar2/settings
+%dir %{_sysconfdir}/pazpar2/settings/mkc
 %dir %{_sysconfdir}/pazpar2/services-enabled
 %dir %{_sysconfdir}/pazpar2/services-available
 %config %{_sysconfdir}/pazpar2/*.xml
 %config %{_sysconfdir}/pazpar2/*.xsl
 %config %{_sysconfdir}/pazpar2/settings/*.xml
+%config %{_sysconfdir}/pazpar2/settings/*/*.xml
 %config %{_sysconfdir}/pazpar2/services-available/*.xml
 %config %{_sysconfdir}/rc.d/init.d/pazpar2
 %config(noreplace) /etc/logrotate.d/pazpar2