removed unneeded patches
This commit is contained in:
parent
56598c5d17
commit
3e8c7ac4c1
@ -1,133 +0,0 @@
|
||||
--- nfs4-acl-tools/man/man1/Makefile.destdir 2007-03-06 13:24:31.000000000 -0600
|
||||
+++ nfs4-acl-tools/man/man1/Makefile 2007-03-06 13:25:58.000000000 -0600
|
||||
@@ -36,7 +36,7 @@
|
||||
MAN_SECTION = 1
|
||||
|
||||
MAN_PAGES = $(shell echo *.$(MAN_SECTION))
|
||||
-MAN_DEST = $(PKG_MAN_DIR)/man$(MAN_SECTION)
|
||||
+MAN_DEST = $(DESTDIR)$(PKG_MAN_DIR)/man$(MAN_SECTION)
|
||||
LSRCFILES = $(MAN_PAGES)
|
||||
|
||||
default : $(MAN_PAGES)
|
||||
--- nfs4-acl-tools/man/man5/Makefile.destdir 2007-03-06 13:26:32.000000000 -0600
|
||||
+++ nfs4-acl-tools/man/man5/Makefile 2007-03-06 13:26:20.000000000 -0600
|
||||
@@ -36,7 +36,7 @@
|
||||
MAN_SECTION = 5
|
||||
|
||||
MAN_PAGES = $(shell echo *.$(MAN_SECTION))
|
||||
-MAN_DEST = $(PKG_MAN_DIR)/man$(MAN_SECTION)
|
||||
+MAN_DEST = $(DESTDIR)$(PKG_MAN_DIR)/man$(MAN_SECTION)
|
||||
LSRCFILES = $(MAN_PAGES)
|
||||
|
||||
default : $(MAN_PAGES)
|
||||
--- nfs4-acl-tools/nfs4_setfacl/Makefile.destdir 2007-02-27 14:32:46.000000000 -0600
|
||||
+++ nfs4-acl-tools/nfs4_setfacl/Makefile 2007-03-06 13:22:58.000000000 -0600
|
||||
@@ -44,12 +44,12 @@
|
||||
include $(BUILDRULES)
|
||||
|
||||
install: default
|
||||
- $(INSTALL) -m 755 -d $(PKG_BIN_DIR)
|
||||
- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
|
||||
- if [ -f $(PKG_BIN_DIR)/nfs4_editfacl ]; then \
|
||||
+ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR)
|
||||
+ $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR)
|
||||
+ if [ -f $(DESTDIR)$(PKG_BIN_DIR)/nfs4_editfacl ]; then \
|
||||
: ; \
|
||||
else \
|
||||
- ln -s $(PKG_BIN_DIR)/nfs4_setfacl $(PKG_BIN_DIR)/nfs4_editfacl ; \
|
||||
+ ln -s nfs4_setfacl $(DESTDIR)$(PKG_BIN_DIR)/nfs4_editfacl ; \
|
||||
fi
|
||||
|
||||
install-dev install-lib:
|
||||
--- nfs4-acl-tools/nfs4_getfacl/Makefile.destdir 2006-08-21 12:05:23.000000000 -0500
|
||||
+++ nfs4-acl-tools/nfs4_getfacl/Makefile 2007-03-06 13:22:58.000000000 -0600
|
||||
@@ -45,7 +45,7 @@
|
||||
include $(BUILDRULES)
|
||||
|
||||
install: default
|
||||
- $(INSTALL) -m 755 -d $(PKG_BIN_DIR)
|
||||
- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
|
||||
+ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR)
|
||||
+ $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR)
|
||||
|
||||
install-dev install-lib:
|
||||
--- nfs4-acl-tools/include/builddefs.destdir 2007-02-27 23:49:27.000000000 -0600
|
||||
+++ nfs4-acl-tools/include/builddefs 2007-03-06 13:23:02.000000000 -0600
|
||||
@@ -45,6 +45,8 @@
|
||||
prefix = /usr/local
|
||||
exec_prefix = ${prefix}
|
||||
|
||||
+DESTDIR =
|
||||
+
|
||||
PKG_NAME = nfs4acl
|
||||
PKG_USER = root
|
||||
PKG_GROUP = root
|
||||
--- nfs4-acl-tools/include/builddefs.in.destdir 2006-10-24 15:26:13.000000000 -0500
|
||||
+++ nfs4-acl-tools/include/builddefs.in 2007-03-06 13:22:58.000000000 -0600
|
||||
@@ -45,6 +45,8 @@
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
||||
+DESTDIR =
|
||||
+
|
||||
PKG_NAME = @pkg_name@
|
||||
PKG_USER = @pkg_user@
|
||||
PKG_GROUP = @pkg_group@
|
||||
--- nfs4-acl-tools/include/buildmacros.destdir 2007-03-06 13:22:58.000000000 -0600
|
||||
+++ nfs4-acl-tools/include/buildmacros 2007-03-06 13:25:10.000000000 -0600
|
||||
@@ -83,10 +83,10 @@
|
||||
ifeq ($(ENABLE_SHARED),yes)
|
||||
INSTALL_LTLIB = \
|
||||
cd $(TOPDIR)/$(LIBNAME)/.libs; \
|
||||
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
|
||||
- ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
|
||||
+ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \
|
||||
+ ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \
|
||||
test "$(PKG_DISTRIBUTION)" = debian || \
|
||||
- ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
|
||||
+ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR)
|
||||
endif
|
||||
|
||||
# Libtool thinks the static and shared libs should be in the same dir, so
|
||||
@@ -98,22 +98,22 @@
|
||||
ifeq ($(ENABLE_SHARED),yes)
|
||||
INSTALL_LTLIB_DEV = \
|
||||
cd $(TOPDIR)/$(LIBNAME)/.libs; \
|
||||
- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
|
||||
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \
|
||||
- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
|
||||
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
|
||||
- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
|
||||
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
|
||||
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
|
||||
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
|
||||
+ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \
|
||||
+ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR); \
|
||||
+ ../$(INSTALL) -m 644 $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
|
||||
+ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \
|
||||
+ ../$(INSTALL) -T so_base $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \
|
||||
+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).a; \
|
||||
+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).la; \
|
||||
+ ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).so
|
||||
else
|
||||
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
|
||||
endif
|
||||
|
||||
INSTALL_LTLIB_STATIC = \
|
||||
cd $(TOPDIR)/$(LIBNAME)/.libs; \
|
||||
- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
|
||||
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR)
|
||||
+ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \
|
||||
+ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR)
|
||||
|
||||
INSTALL_MAN = \
|
||||
@for d in $(MAN_PAGES); do \
|
||||
@@ -145,7 +145,7 @@
|
||||
INSTALL_LINGUAS = \
|
||||
@for l in $(LINGUAS) ""; do \
|
||||
if test -f "$$l.mo" ; then \
|
||||
- ldir=$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \
|
||||
+ ldir=$(DESTDIR)$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \
|
||||
$(INSTALL) -m 755 -d $$ldir; \
|
||||
$(INSTALL) -m 644 $$l.mo $$ldir/$(PKG_NAME).mo; \
|
||||
fi; \
|
@ -1,11 +0,0 @@
|
||||
--- nfs4-acl-tools/include/buildmacros.BAD 2007-03-06 14:30:22.000000000 -0600
|
||||
+++ nfs4-acl-tools/include/buildmacros 2007-03-06 14:30:27.000000000 -0600
|
||||
@@ -37,7 +37,7 @@
|
||||
# $(CXXFILES), or $(HFILES) and is used to construct the manifest list
|
||||
# during the "dist" phase (packaging).
|
||||
|
||||
-LDFLAGS = $(LLDFLAGS)
|
||||
+LDFLAGS += $(LLDFLAGS)
|
||||
LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB)
|
||||
|
||||
MAKEOPTS = --no-print-directory
|
Loading…
Reference in New Issue
Block a user