[patch] [JANKYFIX-000 #3 of 3] xfsdump-3.1.4-destdir.patch

xfsdump-3.1.4-destdir.patch (text/plain), 7.61 KB, created by Greg Turner on 2015-09-26 09:24:08 UTC

diff -urpN xfsdump-3.1.4.orig/Makefile xfsdump-3.1.4/Makefile
--- xfsdump-3.1.4.orig/Makefile	2015-09-22 04:55:07.334044202 -0700
+++ xfsdump-3.1.4/Makefile	2015-09-22 05:03:58.174630980 -0700
@@ -86,8 +86,8 @@ include/config.h: include/builddefs
 	fi
 
 install: default $(addsuffix -install,$(SUBDIRS))
-	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
-	$(INSTALL) -m 644 README $(PKG_DOC_DIR)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR)
+	$(INSTALL) -m 644 README $(DESTDIR)$(PKG_DOC_DIR)
 
 install-dev: default $(addsuffix -install-dev,$(SUBDIRS))
 
diff -urpN xfsdump-3.1.4.orig/debian/Makefile xfsdump-3.1.4/debian/Makefile
--- xfsdump-3.1.4.orig/debian/Makefile	2014-07-17 15:00:46.000000000 -0700
+++ xfsdump-3.1.4/debian/Makefile	2015-09-22 04:57:43.204454271 -0700
@@ -15,8 +15,8 @@ include $(BUILDRULES)
 
 install: default
 ifeq ($(PKG_DISTRIBUTION), debian)
-	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
-	$(INSTALL) -m 644 changelog $(PKG_DOC_DIR)/changelog.Debian
+	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR)
+	$(INSTALL) -m 644 changelog $(DESTDIR)$(PKG_DOC_DIR)/changelog.Debian
 endif
 
 install-dev: default
diff -urpN xfsdump-3.1.4.orig/doc/Makefile xfsdump-3.1.4/doc/Makefile
--- xfsdump-3.1.4.orig/doc/Makefile	2010-03-31 00:47:34.000000000 -0700
+++ xfsdump-3.1.4/doc/Makefile	2015-09-22 04:57:24.865641313 -0700
@@ -21,12 +21,12 @@ CHANGES.gz:
 	$(Q)$(ZIP) --best -c < CHANGES > $@
 
 install: default
-	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
-	$(INSTALL) -m 644 CHANGES.gz $(README) $(PKG_DOC_DIR)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR)
+	$(INSTALL) -m 644 CHANGES.gz $(README) $(DESTDIR)$(PKG_DOC_DIR)
 ifeq ($(PKG_DISTRIBUTION), debian)
-	$(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz
+	$(INSTALL) -S CHANGES.gz $(DESTDIR)$(PKG_DOC_DIR)/changelog.gz
 else
-	$(INSTALL) -m 644 COPYING $(PKG_DOC_DIR)
+	$(INSTALL) -m 644 COPYING $(DESTDIR)$(PKG_DOC_DIR)
 endif
 
 install-dev:
diff -urpN xfsdump-3.1.4.orig/dump/Makefile xfsdump-3.1.4/dump/Makefile
--- xfsdump-3.1.4.orig/dump/Makefile	2015-09-22 04:55:56.233545369 -0700
+++ xfsdump-3.1.4/dump/Makefile	2015-09-22 04:58:10.968171112 -0700
@@ -97,9 +97,9 @@ default: depend $(LTCOMMAND)
 include $(BUILDRULES)
 
 install: default
-	$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
-	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
-	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_ROOT_SBIN_DIR)
+	$(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_ROOT_SBIN_DIR)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_SBIN_DIR)
 install-dev:
 
 .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
diff -urpN xfsdump-3.1.4.orig/include/buildmacros xfsdump-3.1.4/include/buildmacros
--- xfsdump-3.1.4.orig/include/buildmacros	2015-09-22 04:55:56.233545369 -0700
+++ xfsdump-3.1.4/include/buildmacros	2015-09-22 05:00:51.755531494 -0700
@@ -57,9 +57,9 @@ endif
 ifeq ($(ENABLE_SHARED),yes)
 INSTALL_LTLIB = \
 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
-	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-	../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
-	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR)
+	../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_ROOT_LIB_DIR); \
+	../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(DESTDIR)$(PKG_ROOT_LIB_DIR); \
+	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(DESTDIR)$(PKG_ROOT_LIB_DIR)
 endif
 
 # Libtool thinks the static and shared libs should be in the same dir, so
@@ -71,15 +71,15 @@ endif
 ifeq ($(ENABLE_SHARED),yes)
 INSTALL_LTLIB_DEV = \
 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
-	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
-	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
-	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+	../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \
+	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \
+	../$(INSTALL) -m 644 $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).la ; \
+	../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_ROOT_LIB_DIR); \
+	../$(INSTALL) -T so_base $(LIBNAME).lai $(DESTDIR)$(PKG_ROOT_LIB_DIR); \
 	if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \
-	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
-	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
-	../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
+	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(DESTDIR)$(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
+	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(DESTDIR)$(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
+	../$(INSTALL) -S $(DESTDIR)$(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).so; \
 	fi
 else
 INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
@@ -87,7 +87,7 @@ endif
 
 INSTALL_LTLIB_STATIC = \
 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
-	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+	../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \
 	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR)
 
 INSTALL_MAN = \
@@ -106,11 +106,11 @@ INSTALL_MAN = \
 					$(ZIP) -9 -c $$d > $$d.gz; _sfx=.gz; \
 				fi; \
 				u=$$m.$(MAN_SECTION)$$_sfx; \
-				echo $(INSTALL) -m 644 $${d}$$_sfx $${t}$$_sfx;\
-				$(INSTALL) -m 644 $${d}$$_sfx $${t}$$_sfx; \
+				echo $(INSTALL) -m 644 $${d}$$_sfx $(DESTDIR)$${t}$$_sfx;\
+				$(INSTALL) -m 644 $${d}$$_sfx $(DESTDIR)$${t}$$_sfx; \
 			else \
-				echo $(INSTALL) -S $$u $${t}$$_sfx; \
-				$(INSTALL) -S $$u $${t}$$_sfx; \
+				echo $(INSTALL) -S $$u $(DESTDIR)$${t}$$_sfx; \
+				$(INSTALL) -S $$u $(DESTDIR)$${t}$$_sfx; \
 			fi; \
 			first=false; \
 		done; \
@@ -121,8 +121,8 @@ INSTALL_LINGUAS = \
 	@for l in $(LINGUAS) ""; do \
 		if test -f "$$l.mo" ; then \
 			ldir=$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \
-			$(INSTALL) -m 755 -d $$ldir; \
-			$(INSTALL) -m 644 $$l.mo $$ldir/$(PKG_NAME).mo; \
+			$(INSTALL) -m 755 -d $(DESTDIR)$$ldir; \
+			$(INSTALL) -m 644 $$l.mo $(DESTDIR)$$ldir/$(PKG_NAME).mo; \
 		fi; \
 	done
 endif
diff -urpN xfsdump-3.1.4.orig/invutil/Makefile xfsdump-3.1.4/invutil/Makefile
--- xfsdump-3.1.4.orig/invutil/Makefile	2012-10-09 13:42:33.000000000 -0700
+++ xfsdump-3.1.4/invutil/Makefile	2015-09-22 05:01:30.136140168 -0700
@@ -64,8 +64,8 @@ default: depend $(LTCOMMAND)
 include $(BUILDRULES)
 
 install: default
-	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
-	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_SBIN_DIR)
+	$(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_SBIN_DIR)
 install-dev:
 
 .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
diff -urpN xfsdump-3.1.4.orig/man/man8/Makefile xfsdump-3.1.4/man/man8/Makefile
--- xfsdump-3.1.4.orig/man/man8/Makefile	2010-01-13 15:43:55.000000000 -0800
+++ xfsdump-3.1.4/man/man8/Makefile	2015-09-22 05:02:27.124559158 -0700
@@ -16,6 +16,6 @@ default : $(MAN_PAGES)
 include $(BUILDRULES)
 
 install : default
-	$(INSTALL) -m 755 -d $(MAN_DEST)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(MAN_DEST)
 	$(INSTALL_MAN)
 install-dev:
diff -urpN xfsdump-3.1.4.orig/restore/Makefile xfsdump-3.1.4/restore/Makefile
--- xfsdump-3.1.4.orig/restore/Makefile	2015-09-22 04:55:56.233545369 -0700
+++ xfsdump-3.1.4/restore/Makefile	2015-09-22 05:03:08.126141167 -0700
@@ -107,9 +107,9 @@ default: depend $(LTCOMMAND)
 include $(BUILDRULES)
 
 install: default
-	$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
-	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
-	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_ROOT_SBIN_DIR)
+	$(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_ROOT_SBIN_DIR)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_SBIN_DIR)
 install-dev:
 
 .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)