1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00

Update of install-sh, mkinstalldirs, and associated configury

Update install-sh to that from Autoconf 2.63, plus our Darwin-specific
changes (which I simplified a bit).  install-sh is now able to install
multiple files in one run, so we could simplify our makefiles sometime.

install-sh also now has a -d option to create directories, so we don't need
mkinstalldirs anymore.

Use AC_PROG_MKDIR_P in configure.in, so we can use mkdir -p when available
instead of install-sh -d.  For consistency with the rest of the world,
the corresponding make variable has been renamed from $(mkinstalldirs) to
$(MKDIR_P).
This commit is contained in:
Peter Eisentraut
2009-08-26 22:24:44 +00:00
parent 7ca774a873
commit 9d182ef002
34 changed files with 501 additions and 395 deletions

View File

@ -2,7 +2,7 @@
#
# PostgreSQL documentation makefile
#
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.127 2009/08/17 21:29:30 petere Exp $
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.128 2009/08/26 22:24:42 petere Exp $
#
#----------------------------------------------------------------------------
@ -99,20 +99,20 @@ endif
# The draft target creates HTML output in draft mode, without index (for faster build).
draft: postgres.sgml $(ALMOSTALLSGML) stylesheet.dsl
$(mkinstalldirs) $(srcdir)/html
$(MKDIR_P) $(srcdir)/html
$(JADE.html.call) -V draft-mode $<
cp $(srcdir)/stylesheet.css $(srcdir)/html/
html: html-stamp
$(srcdir)/html-stamp: postgres.sgml $(ALLSGML) stylesheet.dsl
$(mkinstalldirs) $(srcdir)/html
$(MKDIR_P) $(srcdir)/html
$(JADE.html.call) -i include-index $<
cp $(srcdir)/stylesheet.css $(srcdir)/html/
touch $@
$(srcdir)/HTML.index: postgres.sgml $(ALMOSTALLSGML) stylesheet.dsl
@$(mkinstalldirs) $(srcdir)/html
@$(MKDIR_P) $(srcdir)/html
$(JADE.html.call) -V html-index $<
$(srcdir)/bookindex.sgml: HTML.index
@ -292,7 +292,7 @@ endif
install: $(if $(found_html),install-html) $(if $(found_man),install-man)
installdirs:
$(mkinstalldirs) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
$(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
uninstall:
rm -f '$(DESTDIR)$(htmldir)/html/'* $(addprefix '$(DESTDIR)$(mandir)'/man, 1/* 3/* $(sqlmansectnum)/*)
@ -335,11 +335,11 @@ all: all-man
all-man: $(fixed_manpage_files)
$(fixed_nonsql_manpage_files): fixedman/%: %
@$(mkinstalldirs) $(dir $@)
@$(MKDIR_P) $(dir $@)
$(fix_sqlmansectnum) $< >$@
$(fixed_sql_manpage_files): fixedman/man$(sqlmansectnum)/%.$(sqlmansect): man7/%.7
@$(mkinstalldirs) $(dir $@)
@$(MKDIR_P) $(dir $@)
$(fix_sqlmansectnum) $< >$@
install-man: all-man