Attachment #412968 for bug #560358

Lines 86-93 include/config.h: include/builddefs Link Here

(-)xfsdump-3.1.4.orig/Makefile (-2 / +2 lines)
86	fi	86	fi
87		87
88	install: default $(addsuffix -install,$(SUBDIRS))	88	install: default $(addsuffix -install,$(SUBDIRS))
89	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)	89	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR)
90	$(INSTALL) -m 644 README $(PKG_DOC_DIR)	90	$(INSTALL) -m 644 README $(DESTDIR)$(PKG_DOC_DIR)
91		91
92	install-dev: default $(addsuffix -install-dev,$(SUBDIRS))	92	install-dev: default $(addsuffix -install-dev,$(SUBDIRS))
93		93

Lines 15-22 include $(BUILDRULES) Link Here

(-)xfsdump-3.1.4.orig/debian/Makefile (-2 / +2 lines)
15		15
16	install: default	16	install: default
17	ifeq ($(PKG_DISTRIBUTION), debian)	17	ifeq ($(PKG_DISTRIBUTION), debian)
18	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)	18	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR)
19	$(INSTALL) -m 644 changelog $(PKG_DOC_DIR)/changelog.Debian	19	$(INSTALL) -m 644 changelog $(DESTDIR)$(PKG_DOC_DIR)/changelog.Debian
20	endif	20	endif
21		21
22	install-dev: default	22	install-dev: default




	$(Q)$(ZIP) --best -c < CHANGES > $@

install: default
	$(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 $(DESTDIR)$(PKG_DOC_DIR)/changelog.gz
else
	$(INSTALL) -m 644 COPYING $(DESTDIR)$(PKG_DOC_DIR)
endif

install-dev:

Lines 97-105 default: depend $(LTCOMMAND) Link Here

(-)xfsdump-3.1.4.orig/dump/Makefile (-3 / +3 lines)
97	include $(BUILDRULES)	97	include $(BUILDRULES)
98		98
99	install: default	99	install: default
100	$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)	100	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_ROOT_SBIN_DIR)
101	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)	101	$(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_ROOT_SBIN_DIR)
102	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)	102	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_SBIN_DIR)
103	install-dev:	103	install-dev:
104		104
105	.dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)	105	.dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)




ifeq ($(ENABLE_SHARED),yes)
INSTALL_LTLIB = \
	cd $(TOPDIR)/$(LIBNAME)/.libs; \
	../$(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

ifeq ($(ENABLE_SHARED),yes)
INSTALL_LTLIB_DEV = \
	cd $(TOPDIR)/$(LIBNAME)/.libs; \
	../$(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 $(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)


INSTALL_LTLIB_STATIC = \
	cd $(TOPDIR)/$(LIBNAME)/.libs; \
	../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \
	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR)

INSTALL_MAN = \

					$(ZIP) -9 -c $$d > $$d.gz; _sfx=.gz; \
				fi; \
				u=$$m.$(MAN_SECTION)$$_sfx; \
				echo $(INSTALL) -m 644 $${d}$$_sfx $(DESTDIR)$${t}$$_sfx;\
				$(INSTALL) -m 644 $${d}$$_sfx $(DESTDIR)$${t}$$_sfx; \
			else \
				echo $(INSTALL) -S $$u $(DESTDIR)$${t}$$_sfx; \
				$(INSTALL) -S $$u $(DESTDIR)$${t}$$_sfx; \
			fi; \
			first=false; \
		done; \

	@for l in $(LINGUAS) ""; do \
		if test -f "$$l.mo" ; then \
			ldir=$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \
			$(INSTALL) -m 755 -d $(DESTDIR)$$ldir; \
			$(INSTALL) -m 644 $$l.mo $(DESTDIR)$$ldir/$(PKG_NAME).mo; \
		fi; \
	done
endif

Lines 64-71 default: depend $(LTCOMMAND) Link Here

(-)xfsdump-3.1.4.orig/invutil/Makefile (-2 / +2 lines)
64	include $(BUILDRULES)	64	include $(BUILDRULES)
65		65
66	install: default	66	install: default
67	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)	67	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_SBIN_DIR)
68	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)	68	$(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_SBIN_DIR)
69	install-dev:	69	install-dev:
70		70
71	.dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)	71	.dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)

Lines 16-21 default : $(MAN_PAGES) Link Here

(-)xfsdump-3.1.4.orig/man/man8/Makefile (-1 / +1 lines)
16	include $(BUILDRULES)	16	include $(BUILDRULES)
17		17
18	install : default	18	install : default
19	$(INSTALL) -m 755 -d $(MAN_DEST)	19	$(INSTALL) -m 755 -d $(DESTDIR)$(MAN_DEST)
20	$(INSTALL_MAN)	20	$(INSTALL_MAN)
21	install-dev:	21	install-dev:

Lines 107-115 default: depend $(LTCOMMAND) Link Here

(-)xfsdump-3.1.4.orig/restore/Makefile (-3 / +3 lines)
107	include $(BUILDRULES)	107	include $(BUILDRULES)
108		108
109	install: default	109	install: default
110	$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)	110	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_ROOT_SBIN_DIR)
111	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)	111	$(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_ROOT_SBIN_DIR)
112	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)	112	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_SBIN_DIR)
113	install-dev:	113	install-dev:
114		114
115	.dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)	115	.dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)

Return to bug 560358

Lines 21-32 CHANGES.gz: Link Here

(-)xfsdump-3.1.4.orig/doc/Makefile (-4 / +4 lines)
21	$(Q)$(ZIP) --best -c < CHANGES > $@	21	$(Q)$(ZIP) --best -c < CHANGES > $@
22		22
23	install: default	23	install: default
24	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)	24	$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR)
25	$(INSTALL) -m 644 CHANGES.gz $(README) $(PKG_DOC_DIR)	25	$(INSTALL) -m 644 CHANGES.gz $(README) $(DESTDIR)$(PKG_DOC_DIR)
26	ifeq ($(PKG_DISTRIBUTION), debian)	26	ifeq ($(PKG_DISTRIBUTION), debian)
27	$(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz	27	$(INSTALL) -S CHANGES.gz $(DESTDIR)$(PKG_DOC_DIR)/changelog.gz
28	else	28	else
29	$(INSTALL) -m 644 COPYING $(PKG_DOC_DIR)	29	$(INSTALL) -m 644 COPYING $(DESTDIR)$(PKG_DOC_DIR)
30	endif	30	endif
31		31
32	install-dev:	32	install-dev:

Lines 57-65 endif Link Here

(-)xfsdump-3.1.4.orig/include/buildmacros (-18 / +18 lines)
57	ifeq ($(ENABLE_SHARED),yes)	57	ifeq ($(ENABLE_SHARED),yes)
58	INSTALL_LTLIB = \	58	INSTALL_LTLIB = \
59	cd $(TOPDIR)/$(LIBNAME)/.libs; \	59	cd $(TOPDIR)/$(LIBNAME)/.libs; \
60	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \	60	../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_ROOT_LIB_DIR); \
61	../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \	61	../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(DESTDIR)$(PKG_ROOT_LIB_DIR); \
62	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR)	62	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(DESTDIR)$(PKG_ROOT_LIB_DIR)
63	endif	63	endif
64		64
65	# Libtool thinks the static and shared libs should be in the same dir, so	65	# Libtool thinks the static and shared libs should be in the same dir, so
Lines 71-85 endif Link Here
71	ifeq ($(ENABLE_SHARED),yes)	71	ifeq ($(ENABLE_SHARED),yes)
72	INSTALL_LTLIB_DEV = \	72	INSTALL_LTLIB_DEV = \
73	cd $(TOPDIR)/$(LIBNAME)/.libs; \	73	cd $(TOPDIR)/$(LIBNAME)/.libs; \
74	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \	74	../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \
75	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \	75	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \
76	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \	76	../$(INSTALL) -m 644 $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).la ; \
77	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \	77	../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_ROOT_LIB_DIR); \
78	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \	78	../$(INSTALL) -T so_base $(LIBNAME).lai $(DESTDIR)$(PKG_ROOT_LIB_DIR); \
79	if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \	79	if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \
80	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \	80	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(DESTDIR)$(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
81	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \	81	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(DESTDIR)$(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
82	../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \	82	../$(INSTALL) -S $(DESTDIR)$(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).so; \
83	fi	83	fi
84	else	84	else
85	INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)	85	INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
Lines 87-93 endif Link Here
87		87
88	INSTALL_LTLIB_STATIC = \	88	INSTALL_LTLIB_STATIC = \
89	cd $(TOPDIR)/$(LIBNAME)/.libs; \	89	cd $(TOPDIR)/$(LIBNAME)/.libs; \
90	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \	90	../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \
91	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR)	91	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR)
92		92
93	INSTALL_MAN = \	93	INSTALL_MAN = \
Lines 106-116 INSTALL_MAN = \ Link Here
106	$(ZIP) -9 -c $$d > $$d.gz; _sfx=.gz; \	106	$(ZIP) -9 -c $$d > $$d.gz; _sfx=.gz; \
107	fi; \	107	fi; \
108	u=$$m.$(MAN_SECTION)$$_sfx; \	108	u=$$m.$(MAN_SECTION)$$_sfx; \
109	echo $(INSTALL) -m 644 $${d}$$_sfx $${t}$$_sfx;\	109	echo $(INSTALL) -m 644 $${d}$$_sfx $(DESTDIR)$${t}$$_sfx;\
110	$(INSTALL) -m 644 $${d}$$_sfx $${t}$$_sfx; \	110	$(INSTALL) -m 644 $${d}$$_sfx $(DESTDIR)$${t}$$_sfx; \
111	else \	111	else \
112	echo $(INSTALL) -S $$u $${t}$$_sfx; \	112	echo $(INSTALL) -S $$u $(DESTDIR)$${t}$$_sfx; \
113	$(INSTALL) -S $$u $${t}$$_sfx; \	113	$(INSTALL) -S $$u $(DESTDIR)$${t}$$_sfx; \
114	fi; \	114	fi; \
115	first=false; \	115	first=false; \
116	done; \	116	done; \
Lines 121-128 INSTALL_LINGUAS = \ Link Here
121	@for l in $(LINGUAS) ""; do \	121	@for l in $(LINGUAS) ""; do \
122	if test -f "$$l.mo" ; then \	122	if test -f "$$l.mo" ; then \
123	ldir=$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \	123	ldir=$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \
124	$(INSTALL) -m 755 -d $$ldir; \	124	$(INSTALL) -m 755 -d $(DESTDIR)$$ldir; \
125	$(INSTALL) -m 644 $$l.mo $$ldir/$(PKG_NAME).mo; \	125	$(INSTALL) -m 644 $$l.mo $(DESTDIR)$$ldir/$(PKG_NAME).mo; \
126	fi; \	126	fi; \
127	done	127	done
128	endif	128	endif