Thomas Woerner
parent
6d1b549d2c
commit
99263aa534
|
|
@ -1,24 +1,253 @@
|
|||
--- e2fsprogs-1.39/intl/Makefile.in.mkinstalldirs 2006-12-25 11:44:27.000000000 +0100
|
||||
+++ e2fsprogs-1.39/intl/Makefile.in 2006-12-25 11:46:16.000000000 +0100
|
||||
--- e2fsprogs-1.39/debugfs/Makefile.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
|
||||
+++ e2fsprogs-1.39/debugfs/Makefile.in 2006-12-25 23:04:27.000000000 +0100
|
||||
@@ -48,8 +48,8 @@
|
||||
@$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
|
||||
|
||||
installdirs:
|
||||
- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
|
||||
+ @echo " MKDIR_P $(root_sbindir) $(man8dir)"
|
||||
+ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
|
||||
$(DESTDIR)$(man8dir)
|
||||
|
||||
install: $(PROGS) $(MANPAGES) installdirs
|
||||
--- e2fsprogs-1.39/intl/Makefile.in.mkinstalldirs 2005-09-06 11:40:14.000000000 +0200
|
||||
+++ e2fsprogs-1.39/intl/Makefile.in 2006-12-25 23:04:27.000000000 +0100
|
||||
@@ -39,8 +39,8 @@
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
-MKINSTALLDIRS = @MKINSTALLDIRS@
|
||||
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
|
||||
+MKINSTALLDIRS = @MKDIR_P@
|
||||
+mkinstalldirs = $(mkdir_p)
|
||||
+MKDIR_P = @MKDIR_P@
|
||||
+mkdir_p = @MKDIR_P@
|
||||
|
||||
l = @INTL_LIBTOOL_SUFFIX_PREFIX@
|
||||
|
||||
--- e2fsprogs-1.39/MCONFIG.in.mkinstalldirs 2006-12-25 11:47:09.000000000 +0100
|
||||
+++ e2fsprogs-1.39/MCONFIG.in 2006-12-25 11:47:11.000000000 +0100
|
||||
--- e2fsprogs-1.39/po/Makefile.in.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
|
||||
+++ e2fsprogs-1.39/po/Makefile.in.in 2006-12-25 23:04:27.000000000 +0100
|
||||
@@ -25,11 +25,10 @@
|
||||
datadir = @datadir@
|
||||
localedir = $(datadir)/locale
|
||||
gettextsrcdir = $(datadir)/gettext/po
|
||||
+mkdir_p = @MKDIR_P@
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
-MKINSTALLDIRS = @MKINSTALLDIRS@
|
||||
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
|
||||
|
||||
GMSGFMT = @GMSGFMT@
|
||||
MSGFMT = @MSGFMT@
|
||||
@@ -148,7 +147,7 @@
|
||||
install-exec:
|
||||
install-data: install-data-@USE_NLS@
|
||||
if test "$(PACKAGE)" = "gettext-tools"; then \
|
||||
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
|
||||
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
|
||||
for file in $(DISTFILES.common) Makevars.template; do \
|
||||
$(INSTALL_DATA) $(srcdir)/$$file \
|
||||
$(DESTDIR)$(gettextsrcdir)/$$file; \
|
||||
@@ -161,13 +160,13 @@
|
||||
fi
|
||||
install-data-no: all
|
||||
install-data-yes: all
|
||||
- $(mkinstalldirs) $(DESTDIR)$(datadir)
|
||||
+ $(mkdir_p) $(DESTDIR)$(datadir)
|
||||
@catalogs='$(CATALOGS)'; \
|
||||
for cat in $$catalogs; do \
|
||||
cat=`basename $$cat`; \
|
||||
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
|
||||
dir=$(localedir)/$$lang/LC_MESSAGES; \
|
||||
- $(mkinstalldirs) $(DESTDIR)$$dir; \
|
||||
+ $(mkdir_p) $(DESTDIR)$$dir; \
|
||||
if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
|
||||
$(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
|
||||
echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
|
||||
@@ -207,19 +206,19 @@
|
||||
installdirs-exec:
|
||||
installdirs-data: installdirs-data-@USE_NLS@
|
||||
if test "$(PACKAGE)" = "gettext-tools"; then \
|
||||
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
|
||||
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
|
||||
else \
|
||||
: ; \
|
||||
fi
|
||||
installdirs-data-no:
|
||||
installdirs-data-yes:
|
||||
- $(mkinstalldirs) $(DESTDIR)$(datadir)
|
||||
+ $(mkdir_p) $(DESTDIR)$(datadir)
|
||||
@catalogs='$(CATALOGS)'; \
|
||||
for cat in $$catalogs; do \
|
||||
cat=`basename $$cat`; \
|
||||
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
|
||||
dir=$(localedir)/$$lang/LC_MESSAGES; \
|
||||
- $(mkinstalldirs) $(DESTDIR)$$dir; \
|
||||
+ $(mkdir_p) $(DESTDIR)$$dir; \
|
||||
for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
|
||||
if test -n "$$lc"; then \
|
||||
if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
|
||||
--- e2fsprogs-1.39/misc/Makefile.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
|
||||
+++ e2fsprogs-1.39/misc/Makefile.in 2006-12-25 23:04:27.000000000 +0100
|
||||
@@ -223,8 +223,8 @@
|
||||
@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
|
||||
|
||||
installdirs:
|
||||
- @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
|
||||
+ @echo " MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
|
||||
+ @$(MKDIR_P) $(DESTDIR)$(sbindir) \
|
||||
$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
|
||||
$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
|
||||
$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
|
||||
--- e2fsprogs-1.39/e2fsck/Makefile.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
|
||||
+++ e2fsprogs-1.39/e2fsck/Makefile.in 2006-12-25 23:04:27.000000000 +0100
|
||||
@@ -172,8 +172,8 @@
|
||||
@$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
|
||||
|
||||
installdirs:
|
||||
- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
|
||||
+ @echo " MKDIR_P $(root_sbindir) $(man8dir)"
|
||||
+ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
|
||||
$(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
|
||||
|
||||
install: $(PROGS) $(MANPAGES) installdirs
|
||||
--- e2fsprogs-1.39/doc/Makefile.in.mkinstalldirs 2005-09-06 11:40:13.000000000 +0200
|
||||
+++ e2fsprogs-1.39/doc/Makefile.in 2006-12-25 23:04:27.000000000 +0100
|
||||
@@ -20,8 +20,8 @@
|
||||
|
||||
install-doc-libs:
|
||||
@$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
|
||||
- @echo " MKINSTALLDIRS $(infodir)"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
|
||||
+ @echo " MKDIR_P $(infodir)"
|
||||
+ @$(MKDIR_P) $(DESTDIR)$(infodir)
|
||||
@for i in libext2fs.info* ; do \
|
||||
echo " INSTALL_DATA $(infodir)/$$i" ; \
|
||||
$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
|
||||
--- e2fsprogs-1.39/resize/Makefile.in.mkinstalldirs 2006-03-18 00:46:41.000000000 +0100
|
||||
+++ e2fsprogs-1.39/resize/Makefile.in 2006-12-25 23:04:27.000000000 +0100
|
||||
@@ -57,8 +57,8 @@
|
||||
@$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
|
||||
|
||||
installdirs:
|
||||
- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
|
||||
+ @echo " MKDIR_P $(root_sbindir) $(man8dir)"
|
||||
+ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
|
||||
$(DESTDIR)$(man8dir)
|
||||
|
||||
install: $(PROGS) $(MANPAGES) installdirs
|
||||
--- e2fsprogs-1.39/MCONFIG.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
|
||||
+++ e2fsprogs-1.39/MCONFIG.in 2006-12-25 23:04:27.000000000 +0100
|
||||
@@ -62,7 +62,7 @@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
-MKINSTALLDIRS = @MKINSTALLDIRS@
|
||||
+MKINSTALLDIRS = @MKDIR_P@
|
||||
+MKDIR_P = @MKDIR_P@
|
||||
|
||||
#
|
||||
# Library definitions
|
||||
--- e2fsprogs-1.39/lib/blkid/Makefile.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
|
||||
+++ e2fsprogs-1.39/lib/blkid/Makefile.in 2006-12-25 23:04:27.000000000 +0100
|
||||
@@ -142,8 +142,8 @@
|
||||
@cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
|
||||
|
||||
installdirs::
|
||||
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid /etc/blkid"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
||||
+ @echo " MKDIR_P $(libdir) $(includedir)/blkid /etc/blkid"
|
||||
+ @$(MKDIR_P) $(DESTDIR)$(libdir) \
|
||||
$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig \
|
||||
$(DESTDIR)/etc/blkid
|
||||
|
||||
--- e2fsprogs-1.39/lib/et/Makefile.in.mkinstalldirs 2005-12-30 04:19:32.000000000 +0100
|
||||
+++ e2fsprogs-1.39/lib/et/Makefile.in 2006-12-25 23:04:27.000000000 +0100
|
||||
@@ -74,8 +74,8 @@
|
||||
$(TAGS) $(SRCS)
|
||||
|
||||
installdirs::
|
||||
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
||||
+ @echo " MKDIR_P $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
|
||||
+ @$(MKDIR_P) $(DESTDIR)$(libdir) \
|
||||
$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
|
||||
$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
|
||||
$(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig
|
||||
--- e2fsprogs-1.39/lib/uuid/Makefile.in.mkinstalldirs 2005-12-30 04:19:32.000000000 +0100
|
||||
+++ e2fsprogs-1.39/lib/uuid/Makefile.in 2006-12-25 23:04:27.000000000 +0100
|
||||
@@ -126,8 +126,8 @@
|
||||
@cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
|
||||
|
||||
installdirs::
|
||||
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
||||
+ @echo " MKDIR_P $(libdir) $(includedir)/uuid $(man3dir)"
|
||||
+ @$(MKDIR_P) $(DESTDIR)$(libdir) \
|
||||
$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \
|
||||
$(DESTDIR)$(libdir)/pkgconfig
|
||||
|
||||
--- e2fsprogs-1.39/lib/ext2fs/Makefile.in.mkinstalldirs 2006-04-09 04:02:02.000000000 +0200
|
||||
+++ e2fsprogs-1.39/lib/ext2fs/Makefile.in 2006-12-25 23:04:27.000000000 +0100
|
||||
@@ -236,8 +236,8 @@
|
||||
LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_types
|
||||
|
||||
installdirs::
|
||||
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
||||
+ @echo " MKDIR_P $(libdir) $(includedir)/ext2fs"
|
||||
+ @$(MKDIR_P) $(DESTDIR)$(libdir) \
|
||||
$(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig
|
||||
|
||||
install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc
|
||||
--- e2fsprogs-1.39/lib/Makefile.elf-lib.mkinstalldirs 2006-12-25 23:31:27.000000000 +0100
|
||||
+++ e2fsprogs-1.39/lib/Makefile.elf-lib 2006-12-25 23:31:28.000000000 +0100
|
||||
@@ -33,8 +33,8 @@
|
||||
@$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
|
||||
|
||||
installdirs-elf-lib::
|
||||
- @echo " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
|
||||
+ @echo " MKDIR_P $(ELF_INSTALL_DIR) $(libdir)"
|
||||
+ @$(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \
|
||||
$(DESTDIR)$(libdir)
|
||||
|
||||
installdirs:: installdirs-elf-lib
|
||||
--- e2fsprogs-1.39/lib/e2p/Makefile.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
|
||||
+++ e2fsprogs-1.39/lib/e2p/Makefile.in 2006-12-25 23:04:27.000000000 +0100
|
||||
@@ -73,8 +73,8 @@
|
||||
./tst_ostype
|
||||
|
||||
installdirs::
|
||||
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/e2p"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
||||
+ @echo " MKDIR_P $(libdir) $(includedir)/e2p"
|
||||
+ @$(MKDIR_P) $(DESTDIR)$(libdir) \
|
||||
$(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig
|
||||
|
||||
install:: all installdirs
|
||||
--- e2fsprogs-1.39/lib/ss/Makefile.in.mkinstalldirs 2005-12-30 04:19:32.000000000 +0100
|
||||
+++ e2fsprogs-1.39/lib/ss/Makefile.in 2006-12-25 23:04:27.000000000 +0100
|
||||
@@ -125,8 +125,8 @@
|
||||
@cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
|
||||
|
||||
installdirs::
|
||||
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
||||
+ @echo " MKDIR_P $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
|
||||
+ @$(MKDIR_P) $(DESTDIR)$(libdir) \
|
||||
$(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \
|
||||
$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig
|
||||
|
||||
--- e2fsprogs-1.39/configure.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
|
||||
+++ e2fsprogs-1.39/configure.in 2006-12-25 23:04:27.000000000 +0100
|
||||
@@ -550,6 +550,7 @@
|
||||
AC_CHECK_TOOL(RANLIB, ranlib, :)
|
||||
AC_CHECK_TOOL(STRIP, strip, :)
|
||||
AC_PROG_INSTALL
|
||||
+AC_PROG_MKDIR_P
|
||||
# See if we need a separate native compiler.
|
||||
if test $cross_compiling = no; then
|
||||
BUILD_CC="$CC"
|
||||
|
|
|
|||
Loading…
Reference in New Issue