- handle variable location of compare-dirs binary

diff --git a/snapper.spec.in b/snapper.spec.in
index e516f79e340fc85aa78939bebbebeb898cedba0c..3d582653350dccb88ef2fe48519cad4c984685da 100644 (file)
--- a/snapper.spec.in
+++ b/snapper.spec.in
@@ -121,9 +121,9 @@ Authors:
 %else
 %config(noreplace) %{_sysconfdir}/sysconfig/snapper
 %endif
-%dir %{prefix}/lib/snapper
-%dir %{prefix}/lib/snapper/bin
-%{prefix}/lib/snapper/bin/compare-dirs
+%dir %{_libdir}/snapper
+%dir %{_libdir}/snapper/bin
+%{_libdir}/snapper/bin/compare-dirs
 
 %post -n libsnapper@LIBVERSION_MAJOR@
 /sbin/ldconfig

diff --git a/snapper/Makefile.am b/snapper/Makefile.am
index 6a528fe31daba3ac7032cdc7974c7bbc9579f6e3..5603577e3625d91dbed300980ef4386fc99afc62 100644 (file)
--- a/snapper/Makefile.am
+++ b/snapper/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile.am for snapper/snapper
 #
 
-AM_CXXFLAGS = -D_FILE_OFFSET_BITS=64 -I/usr/include/libxml2
+AM_CXXFLAGS = -D_FILE_OFFSET_BITS=64 -DLIBDIR=\"$(libdir)\" -I/usr/include/libxml2
 
 lib_LTLIBRARIES = libsnapper.la
 

diff --git a/snapper/SnapperDefines.h b/snapper/SnapperDefines.h
index a3a3f625a06a4fb7cb9ce279836e53c63ea0b211..024977814b1c47d7cfdcb390d47186c6d7b019e7 100644 (file)
--- a/snapper/SnapperDefines.h
+++ b/snapper/SnapperDefines.h
@@ -35,7 +35,7 @@
 
 #define CHSNAPBIN "/sbin/chsnap"
 
-#define COMPAREDIRSBIN "/usr/lib/snapper/bin/compare-dirs"
+#define COMPAREDIRSBIN LIBDIR "/snapper/bin/compare-dirs"
 
 #define NICEBIN "/usr/bin/nice"
 #define IONICEBIN "/usr/bin/ionice"