diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml index e90a0e1f837..54b5f22d6ec 100644 --- a/doc/src/sgml/ref/allfiles.sgml +++ b/doc/src/sgml/ref/allfiles.sgml @@ -219,7 +219,6 @@ Complete list of usable sgml source files in this directory. <!ENTITY pgupgrade SYSTEM "pgupgrade.sgml"> <!ENTITY pgwaldump SYSTEM "pg_waldump.sgml"> <!ENTITY postgres SYSTEM "postgres-ref.sgml"> -<!ENTITY postmaster SYSTEM "postmaster.sgml"> <!ENTITY psqlRef SYSTEM "psql-ref.sgml"> <!ENTITY reindexdb SYSTEM "reindexdb.sgml"> <!ENTITY vacuumdb SYSTEM "vacuumdb.sgml"> diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml deleted file mode 100644 index 7b544ed0b61..00000000000 --- a/doc/src/sgml/ref/postmaster.sgml +++ /dev/null @@ -1,44 +0,0 @@ -<!-- -doc/src/sgml/ref/postmaster.sgml -PostgreSQL documentation ---> - -<refentry id="app-postmaster"> - <indexterm zone="app-postmaster"> - <primary>postmaster</primary> - </indexterm> - - <refmeta> - <refentrytitle><application>postmaster</application></refentrytitle> - <manvolnum>1</manvolnum> - <refmiscinfo>Application</refmiscinfo> - </refmeta> - - <refnamediv> - <refname>postmaster</refname> - <refpurpose><productname>PostgreSQL</productname> database server</refpurpose> - </refnamediv> - - <refsynopsisdiv> - <cmdsynopsis> - <command>postmaster</command> - <arg rep="repeat"><replaceable>option</replaceable></arg> - </cmdsynopsis> - </refsynopsisdiv> - - <refsect1> - <title>Description</title> - - <para> - <command>postmaster</command> is a deprecated alias of <command>postgres</command>. - </para> - </refsect1> - - <refsect1> - <title>See Also</title> - - <para> - <xref linkend="app-postgres"/> - </para> - </refsect1> -</refentry> diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml index a3b743e8c1e..e11b4b61307 100644 --- a/doc/src/sgml/reference.sgml +++ b/doc/src/sgml/reference.sgml @@ -289,7 +289,6 @@ &pgupgrade; &pgwaldump; &postgres; - &postmaster; </reference> diff --git a/src/backend/Makefile b/src/backend/Makefile index 3d851f757f0..86e6dcb7925 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -216,12 +216,6 @@ endif install-bin: postgres $(POSTGRES_IMP) installdirs $(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)' -ifneq ($(PORTNAME), win32) - @rm -f '$(DESTDIR)$(bindir)/postmaster$(X)' - ln -s postgres$(X) '$(DESTDIR)$(bindir)/postmaster$(X)' -else - $(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postmaster$(X)' -endif ifeq ($(MAKE_EXPORTS), true) $(INSTALL_DATA) $(POSTGRES_IMP) '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)' $(INSTALL_PROGRAM) $(MKLDEXPORT) '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh' @@ -250,7 +244,7 @@ endif ########################################################################## uninstall: - rm -f '$(DESTDIR)$(bindir)/postgres$(X)' '$(DESTDIR)$(bindir)/postmaster' + rm -f '$(DESTDIR)$(bindir)/postgres$(X)' ifeq ($(MAKE_EXPORTS), true) rm -f '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)' rm -f '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh'