database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00
Code Activity

Allow installation into directories containing spaces in the name.

Browse Source
This commit is contained in:
Peter Eisentraut
2005-12-09 21:19:36 +00:00
parent 3a20db975e
commit a29c04a541
49 changed files with 258 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/makefiles/Makefile
View File

@@ -1,4 +1,4 @@
# $PostgreSQL: pgsql/src/makefiles/Makefile,v 1.1 2004/07/30 12:26:40 petere Exp $
# $PostgreSQL: pgsql/src/makefiles/Makefile,v 1.2 2005/12/09 21:19:36 petere Exp $
subdir = src/makefiles
top_builddir = ../..
@@ -6,10 +6,10 @@ include $(top_builddir)/src/Makefile.global
install: all installdirs
$(INSTALL_DATA) $(srcdir)/pgxs.mk $(DESTDIR)$(pgxsdir)/$(subdir)/
$(INSTALL_DATA) $(srcdir)/pgxs.mk '$(DESTDIR)$(pgxsdir)/$(subdir)/'
installdirs:
$(mkinstalldirs) $(DESTDIR)$(pgxsdir)/$(subdir)
$(mkinstalldirs) '$(DESTDIR)$(pgxsdir)/$(subdir)'
uninstall:
rm -f $(DESTDIR)$(pgxsdir)/$(subdir)/pgxs.mk
rm -f '$(DESTDIR)$(pgxsdir)/$(subdir)/pgxs.mk'

2
src/makefiles/Makefile.bsdi
View File

@@ -14,7 +14,7 @@ endif
ifeq ($(DLSUFFIX), .so)
CFLAGS_SL = -fpic
rpath = -Wl,-rpath,$(rpathdir)
rpath = -Wl,-rpath,'$(rpathdir)'
export_dynamic = -Wl,-export-dynamic
else
CFLAGS_SL =

2
src/makefiles/Makefile.freebsd
View File

@@ -2,7 +2,7 @@ AROPT = cr
ifdef ELF_SYSTEM
export_dynamic = -Wl,-export-dynamic
rpath = -Wl,-R$(rpathdir)
rpath = -Wl,-R'$(rpathdir)'
endif
DLSUFFIX = .so

4
src/makefiles/Makefile.hpux
View File

@@ -19,9 +19,9 @@ LIBS := -lxnet $(LIBS)
# Set up rpath so that the executables don't need SHLIB_PATH to be set.
# (Note: --disable-rpath is a really bad idea on this platform...)
ifeq ($(with_gnu_ld), yes)
rpath = -Wl,-rpath -Wl,$(rpathdir)
rpath = -Wl,-rpath -Wl,'$(rpathdir)'
else
rpath = -Wl,+b -Wl,$(rpathdir)
rpath = -Wl,+b -Wl,'$(rpathdir)'
endif
# catch null pointer dereferences

2
src/makefiles/Makefile.irix
View File

@@ -1,6 +1,6 @@
MK_NO_LORDER= true
AROPT = crs
rpath = -Wl,-rpath,$(rpathdir)
rpath = -Wl,-rpath,'$(rpathdir)'
DLSUFFIX = .so
# PIC is default

2
src/makefiles/Makefile.linux
View File

@@ -1,6 +1,6 @@
AROPT = crs
export_dynamic = -Wl,-E
rpath = -Wl,-rpath,$(rpathdir)
rpath = -Wl,-rpath,'$(rpathdir)'
allow_nonpic_in_shlib = yes
DLSUFFIX = .so

4
src/makefiles/Makefile.netbsd
View File

@@ -2,9 +2,9 @@ AROPT = cr
ifdef ELF_SYSTEM
export_dynamic = -Wl,-E
rpath = -Wl,-R$(rpathdir)
rpath = -Wl,-R'$(rpathdir)'
else
rpath = -Wl,-R$(rpathdir)
rpath = -Wl,-R'$(rpathdir)'
endif
DLSUFFIX = .so

2
src/makefiles/Makefile.openbsd
View File

@@ -2,7 +2,7 @@ AROPT = cr
ifdef ELF_SYSTEM
export_dynamic = -Wl,-E
rpath = -Wl,-R$(rpathdir)
rpath = -Wl,-R'$(rpathdir)'
endif
DLSUFFIX = .so

2
src/makefiles/Makefile.osf
View File

@@ -1,7 +1,7 @@
AROPT = crs
DLSUFFIX = .so
CFLAGS_SL =
rpath = -rpath $(rpathdir)
rpath = -rpath '$(rpathdir)'
%.so: %.o
$(LD) -shared -expect_unresolved '*' -o $@ $<

6
src/makefiles/Makefile.solaris
View File

@@ -1,12 +1,12 @@
# $PostgreSQL: pgsql/src/makefiles/Makefile.solaris,v 1.12 2004/12/21 18:47:42 tgl Exp $
# $PostgreSQL: pgsql/src/makefiles/Makefile.solaris,v 1.13 2005/12/09 21:19:36 petere Exp $
AROPT = crs
ifeq ($(with_gnu_ld), yes)
export_dynamic = -Wl,-E
rpath = -Wl,-rpath,$(rpathdir)
rpath = -Wl,-rpath,'$(rpathdir)'
else
rpath = -Wl,-R$(rpathdir)
rpath = -Wl,-R'$(rpathdir)'
endif
DLSUFFIX = .so

8
src/makefiles/Makefile.unixware
View File

@@ -1,15 +1,15 @@
AROPT = crs
ifeq ($(with_gnu_ld), yes)
export_dynamic = -Wl,-E
export_dynamic = -Wl,-E
else
export_dynamic = -Wl,-Bexport
export_dynamic = -Wl,-Bexport
endif
ifeq ($(ld_R_works), yes)
ifeq ($(with_gnu_ld), yes)
rpath = -Wl,-rpath,$(rpathdir)
rpath = -Wl,-rpath,'$(rpathdir)'
else
rpath = -Wl,-R$(rpathdir)
rpath = -Wl,-R'$(rpathdir)'
endif
endif

48
src/makefiles/pgxs.mk
View File

@@ -1,6 +1,6 @@
# PGXS: PostgreSQL extensions makefile
# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.6 2005/09/27 17:43:31 tgl Exp $
# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.7 2005/12/09 21:19:36 petere Exp $
# This file contains generic rules to build many kinds of simple
# extension modules. You only need to set a few variables and include
@@ -89,82 +89,82 @@ endif # MODULE_big
install: all installdirs
ifneq (,$(DATA)$(DATA_built))
@for file in $(addprefix $(srcdir)/, $(DATA)) $(DATA_built); do \
echo "$(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/contrib"; \
$(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/contrib; \
echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib'"; \
$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib'; \
done
endif # DATA
ifdef MODULES
@for file in $(addsuffix $(DLSUFFIX), $(MODULES)); do \
echo "$(INSTALL_SHLIB) $$file $(DESTDIR)$(pkglibdir)"; \
$(INSTALL_SHLIB) $$file $(DESTDIR)$(pkglibdir); \
echo "$(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)'"; \
$(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)'; \
done
endif # MODULES
ifdef DOCS
ifdef docdir
@for file in $(addprefix $(srcdir)/, $(DOCS)); do \
echo "$(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/contrib"; \
$(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/contrib; \
echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/contrib'"; \
$(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/contrib'; \
done
endif # docdir
endif # DOCS
ifdef PROGRAM
$(INSTALL_PROGRAM) $(PROGRAM)$(X) $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)'
endif # PROGRAM
ifdef MODULE_big
$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/$(MODULE_big)$(DLSUFFIX)
$(INSTALL_SHLIB) $(shlib) '$(DESTDIR)$(pkglibdir)/$(MODULE_big)$(DLSUFFIX)'
endif # MODULE_big
ifdef SCRIPTS
@for file in $(addprefix $(srcdir)/, $(SCRIPTS)); do \
echo "$(INSTALL_SCRIPT) $$file $(DESTDIR)$(bindir)"; \
$(INSTALL_SCRIPT) $$file $(DESTDIR)$(bindir); \
echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \
$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'; \
done
endif # SCRIPTS
ifdef SCRIPTS_built
@for file in $(SCRIPTS_built); do \
echo "$(INSTALL_SCRIPT) $$file $(DESTDIR)$(bindir)"; \
$(INSTALL_SCRIPT) $$file $(DESTDIR)$(bindir); \
echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \
$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'; \
done
endif # SCRIPTS_built
installdirs:
ifneq (,$(DATA)$(DATA_built))
$(mkinstalldirs) $(DESTDIR)$(datadir)/contrib
$(mkinstalldirs) '$(DESTDIR)$(datadir)/contrib'
endif
ifneq (,$(MODULES)$(MODULE_big))
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
$(mkinstalldirs) '$(DESTDIR)$(pkglibdir)'
endif
ifdef DOCS
ifdef docdir
$(mkinstalldirs) $(DESTDIR)$(docdir)/contrib
$(mkinstalldirs) '$(DESTDIR)$(docdir)/contrib'
endif # docdir
endif # DOCS
ifneq (,$(PROGRAM)$(SCRIPTS)$(SCRIPTS_built))
$(mkinstalldirs) $(DESTDIR)$(bindir)
$(mkinstalldirs) '$(DESTDIR)$(bindir)'
endif
uninstall:
ifneq (,$(DATA)$(DATA_built))
rm -f $(addprefix $(DESTDIR)$(datadir)/contrib/, $(notdir $(DATA) $(DATA_built)))
rm -f $(addprefix '$(DESTDIR)$(datadir)'/contrib/, $(notdir $(DATA) $(DATA_built)))
endif
ifdef MODULES
rm -f $(addprefix $(DESTDIR)$(pkglibdir)/, $(addsuffix $(DLSUFFIX), $(MODULES)))
rm -f $(addprefix '$(DESTDIR)$(pkglibdir)'/, $(addsuffix $(DLSUFFIX), $(MODULES)))
endif
ifdef DOCS
rm -f $(addprefix $(DESTDIR)$(docdir)/contrib/, $(DOCS))
rm -f $(addprefix '$(DESTDIR)$(docdir)'/contrib/, $(DOCS))
endif
ifdef PROGRAM
rm -f $(DESTDIR)$(bindir)/$(PROGRAM)$(X)
rm -f '$(DESTDIR)$(bindir)/$(PROGRAM)$(X)'
endif
ifdef MODULE_big
rm -f $(DESTDIR)$(pkglibdir)/$(MODULE_big)$(DLSUFFIX)
rm -f '$(DESTDIR)$(pkglibdir)/$(MODULE_big)$(DLSUFFIX)'
endif
ifdef SCRIPTS
rm -f $(addprefix $(DESTDIR)$(bindir)/, $(SCRIPTS))
rm -f $(addprefix '$(DESTDIR)$(bindir)'/, $(SCRIPTS))
endif
ifdef SCRIPTS_built
rm -f $(addprefix $(DESTDIR)$(bindir)/, $(SCRIPTS_built))
rm -f $(addprefix '$(DESTDIR)$(bindir)'/, $(SCRIPTS_built))
endif