summaryrefslogtreecommitdiffstats
path: root/source/ap/xfsdump/xfsdump.destdir.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap/xfsdump/xfsdump.destdir.diff')
-rw-r--r--source/ap/xfsdump/xfsdump.destdir.diff42
1 files changed, 20 insertions, 22 deletions
diff --git a/source/ap/xfsdump/xfsdump.destdir.diff b/source/ap/xfsdump/xfsdump.destdir.diff
index 1772465dc..a42bb3a20 100644
--- a/source/ap/xfsdump/xfsdump.destdir.diff
+++ b/source/ap/xfsdump/xfsdump.destdir.diff
@@ -1,32 +1,19 @@
---- ./include/buildmacros.orig 2007-09-10 21:01:12.000000000 -0500
-+++ ./include/buildmacros 2008-04-01 00:06:53.000000000 -0500
-@@ -27,7 +27,7 @@
- $(LFILES:.l=.o) \
- $(YFILES:%.y=%.tab.o)
-
--INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
-+INSTALL = $(TOPDIR)/install-sh
+--- ./include/builddefs.in.orig 2010-01-12 19:53:18.000000000 -0600
++++ ./include/builddefs.in 2010-02-09 15:17:24.000000000 -0600
+@@ -32,13 +32,13 @@
+ datarootdir = @datarootdir@
+ top_builddir = @top_builddir@
- SHELL = /bin/sh
- IMAGES_DIR = $(TOPDIR)/all-images
---- ./include/builddefs.in.orig 2007-09-10 21:01:12.000000000 -0500
-+++ ./include/builddefs.in 2008-04-01 00:06:53.000000000 -0500
-@@ -30,14 +30,14 @@
- PKG_VERSION = @pkg_version@
- PKG_PLATFORM = @pkg_platform@
- PKG_DISTRIBUTION= @pkg_distribution@
--PKG_BIN_DIR = @bindir@
-PKG_SBIN_DIR = @sbindir@
--PKG_LIB_DIR = @libdir@@libdirsuffix@
--PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@
+-PKG_ROOT_SBIN_DIR = @root_sbindir@
+-PKG_ROOT_LIB_DIR= @root_libdir@@libdirsuffix@
-PKG_INC_DIR = @includedir@
-PKG_MAN_DIR = @mandir@
-PKG_DOC_DIR = @datadir@/doc/@pkg_name@
-PKG_LOCALE_DIR = @datadir@/locale
-+PKG_BIN_DIR = $(DESTDIR)@bindir@
+PKG_SBIN_DIR = $(DESTDIR)@sbindir@
-+PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@
-+PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@
++PKG_ROOT_SBIN_DIR = $(DESTDIR)@root_sbindir@
++PKG_ROOT_LIB_DIR= $(DESTDIR)@root_libdir@@libdirsuffix@
+PKG_INC_DIR = $(DESTDIR)@includedir@
+PKG_MAN_DIR = $(DESTDIR)@mandir@
+PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@
@@ -34,3 +21,14 @@
CC = @cc@
AWK = @awk@
+--- ./include/buildmacros.orig 2010-01-12 19:53:18.000000000 -0600
++++ ./include/buildmacros 2010-02-09 15:15:47.000000000 -0600
+@@ -30,7 +30,7 @@
+ $(LFILES:.l=.o) \
+ $(YFILES:%.y=%.tab.o)
+
+-INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL = $(TOPDIR)/install-sh
+
+ SHELL = /bin/sh
+ IMAGES_DIR = $(TOPDIR)/all-images