Explorar el Código

build: Use MKDIR_P instead of obsolete mkdir_p

Autoconf provides an AC_PROG_MKDIR_P macro defining MKDIR_P which is
called by AM_INIT_AUTOMAKE; the obsolete mkdir_p, currently aliased to
MKDIR_P will disappear with automake 1.13.
Guillem Jover hace 14 años
padre
commit
f4cd2a9368
Se han modificado 8 ficheros con 17 adiciones y 17 borrados
  1. 1 1
      Makecheck.am
  2. 1 1
      dpkg-split/Makefile.am
  3. 1 1
      dselect/Makefile.am
  4. 5 5
      dselect/methods/Makefile.am
  5. 1 1
      man/Makefile.am
  6. 3 3
      scripts/Makefile.am
  7. 3 3
      src/Makefile.am
  8. 2 2
      utils/Makefile.am

+ 1 - 1
Makecheck.am

@@ -13,7 +13,7 @@ check-clean:
 	rm -fr $(test_tmpdir)
 
 check-local: $(test_data) $(test_cases)
-	$(mkdir_p) $(test_tmpdir)
+	$(MKDIR_P) $(test_tmpdir)
 	PATH="$(top_builddir)/src:$(top_builddir)/scripts:$(top_builddir)/utils:$(PATH)" \
 	  LC_ALL=C \
 	  $(TEST_ENV_VARS) \

+ 1 - 1
dpkg-split/Makefile.am

@@ -25,4 +25,4 @@ dpkg_split_LDADD = \
 	$(LIBINTL)
 
 install-data-local:
-	$(mkdir_p) $(DESTDIR)$(admindir)/parts
+	$(MKDIR_P) $(DESTDIR)$(admindir)/parts

+ 1 - 1
dselect/Makefile.am

@@ -62,4 +62,4 @@ curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl
 	perl $(srcdir)/mkcurkeys.pl $< $$cursesfile >$@
 
 install-data-local:
-	$(mkdir_p) $(DESTDIR)$(pkgconfdir)/dselect.cfg.d
+	$(MKDIR_P) $(DESTDIR)$(pkgconfdir)/dselect.cfg.d

+ 5 - 5
dselect/methods/Makefile.am

@@ -38,8 +38,8 @@ nobase_dist_perllib_DATA = Debian/Dselect/Ftp.pm
 EXTRA_DIST = multicd/README.multicd
 
 install-data-local:
-	$(mkdir_p) $(DESTDIR)$(admindir)/methods/mnt
-	$(mkdir_p) $(DESTDIR)$(admindir)/methods/disk
-	$(mkdir_p) $(DESTDIR)$(admindir)/methods/floppy
-	$(mkdir_p) $(DESTDIR)$(admindir)/methods/ftp
-	$(mkdir_p) $(DESTDIR)$(admindir)/methods/multicd
+	$(MKDIR_P) $(DESTDIR)$(admindir)/methods/mnt
+	$(MKDIR_P) $(DESTDIR)$(admindir)/methods/disk
+	$(MKDIR_P) $(DESTDIR)$(admindir)/methods/floppy
+	$(MKDIR_P) $(DESTDIR)$(admindir)/methods/ftp
+	$(MKDIR_P) $(DESTDIR)$(admindir)/methods/multicd

+ 1 - 1
man/Makefile.am

@@ -140,6 +140,6 @@ dist-hook: man.stamp
 	for lang in $(LINGUAS_DIST); do \
 		cp $(srcdir)/po/$$lang.po $(distdir)/po; \
 		cp $(srcdir)/po/$$lang.add $(distdir)/po; \
-		$(mkdir_p) $(distdir)/$$lang; \
+		$(MKDIR_P) $(distdir)/$$lang; \
 		cp -r $(srcdir)/$$lang $(distdir)/; \
 	done

+ 3 - 3
scripts/Makefile.am

@@ -120,12 +120,12 @@ do_shell_subst = $(AM_V_GEN) \
 		 sed -e "s:^version[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:version=\"$(PACKAGE_VERSION)\":"
 
 %: %.pl Makefile
-	@test -d `dirname $@` || $(mkdir_p) `dirname $@`
+	@test -d `dirname $@` || $(MKDIR_P) `dirname $@`
 	$(do_perl_subst) <$< >$@
 	$(AM_V_at) chmod +x $@
 
 %: %.sh Makefile
-	@test -d `dirname $@` || $(mkdir_p) `dirname $@`
+	@test -d `dirname $@` || $(MKDIR_P) `dirname $@`
 	$(do_shell_subst) <$< >$@
 	$(AM_V_at) chmod +x $@
 
@@ -134,7 +134,7 @@ if BUILD_POD_DOC
 # Install manual pages for perl modules manually as make can't deal
 # properly with filenames containing colons
 # Remove empty manual pages (perl modules not documented)
-	$(mkdir_p) $(DESTDIR)$(man3dir)
+	$(MKDIR_P) $(DESTDIR)$(man3dir)
 	for module in $(nobase_dist_perllib_DATA); do \
 	    name=`echo $$module | sed -e 's|/|::|g' -e 's/\.pm$$//'`; \
 	    $(POD2MAN) --utf8 --center=libdpkg-perl --release=$(VERSION) \

+ 3 - 3
src/Makefile.am

@@ -81,9 +81,9 @@ dpkg_trigger_SOURCES = \
 	trigcmd.c
 
 install-data-local:
-	$(mkdir_p) $(DESTDIR)$(pkgconfdir)/dpkg.cfg.d
-	$(mkdir_p) $(DESTDIR)$(admindir)/info
-	$(mkdir_p) $(DESTDIR)$(admindir)/updates
+	$(MKDIR_P) $(DESTDIR)$(pkgconfdir)/dpkg.cfg.d
+	$(MKDIR_P) $(DESTDIR)$(admindir)/info
+	$(MKDIR_P) $(DESTDIR)$(admindir)/updates
 
 TEST_VERBOSE = 0
 

+ 2 - 2
utils/Makefile.am

@@ -55,8 +55,8 @@ transform = s/dpkg-install-info/install-info/; $(program_transform_name)
 
 install-data-local:
 if BUILD_UPDATE_ALTERNATIVES
-	$(mkdir_p) $(DESTDIR)$(sysconfdir)/alternatives
-	$(mkdir_p) $(DESTDIR)$(admindir)/alternatives
+	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/alternatives
+	$(MKDIR_P) $(DESTDIR)$(admindir)/alternatives
 	$(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/alternatives/README
 endif