Skip to content

Commit f7587ae

Browse files
committed
> Am Dienstag, 17. August 2004 14:26 schrieb Fabien COELHO:
> > The patch adds missing the "libpgport.a" file to the installation under > > "install-all-headers". It is needed by some contribs. I install the > > library in "pkglibdir", but I was wondering whether it should be "libdir"? Please find attached a small patch against current CVS head that fixes pgport library installation so that it goes to libdir instead of pkglibdir. It works for me. Fabien Coelho
1 parent 9225994 commit f7587ae

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/Makefile.global.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.193 2004/08/20 20:13:10 momjian Exp $
2+
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.194 2004/08/28 22:55:06 momjian Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -360,7 +360,7 @@ ifneq (,$(LIBOBJS))
360360
LIBS := -lpgport $(LIBS)
361361
ifdef PGXS
362362
# where libpgport.a is installed
363-
LDFLAGS := -L$(pkglibdir) $(LDFLAGS)
363+
LDFLAGS := -L$(libdir) $(LDFLAGS)
364364
else
365365
LDFLAGS := -L$(top_builddir)/src/port $(LDFLAGS)
366366
endif

src/port/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# with broken/missing library files.
88

99
# IDENTIFICATION
10-
# $PostgreSQL: pgsql/src/port/Makefile,v 1.17 2004/08/20 20:13:10 momjian Exp $
10+
# $PostgreSQL: pgsql/src/port/Makefile,v 1.18 2004/08/28 22:55:06 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -22,10 +22,10 @@ all: libpgport.a
2222

2323
# libpgport is needed by some contrib
2424
install-all-headers:
25-
$(INSTALL_STLIB) libpgport.a $(DESTDIR)$(pkglibdir)
25+
$(INSTALL_STLIB) libpgport.a $(DESTDIR)$(libdir)
2626

2727
uninstall:
28-
$(RM) $(DESTDIR)$(pkglibdir)/libpgport.a
28+
$(RM) $(DESTDIR)$(libdir)/libpgport.a
2929

3030
libpgport.a: $(LIBOBJS)
3131
$(AR) $(AROPT) $@ $^

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy