diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/Makefile | 16 | ||||
| -rwxr-xr-x | src/backend/port/aix/mkldexport.sh | 2 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile index a5389a7587..15365ffed5 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -34,7 +34,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.23 1997/04/04 10:38:49 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.24 1997/05/22 00:11:23 scrappy Exp $ # #------------------------------------------------------------------------- @@ -51,13 +51,7 @@ endif OBJS = $(DIRS:%=%/SUBSYS.o) -ifeq ($(MAKE_EXPORTS), true) -EXP = postgres$(EXPSUFF) -else -EXP = -endif - -all: postgres $(EXP) global1.bki.source local1_template1.bki.source +all: postgres $(POSTGRES_IMP) global1.bki.source local1_template1.bki.source postgres: $(OBJS) ../utils/version.o $(CC) -o postgres $(OBJS) ../utils/version.o $(LDFLAGS) @@ -96,7 +90,7 @@ fmgr.h: ############################################################################# clean: - rm -f postgres fmgr.h parse.h \ + rm -f postgres $(POSTGRES_IMP) fmgr.h parse.h \ global1.bki.source local1_template1.bki.source for i in $(DIRS); do $(MAKE) -C $$i clean PORTNAME=$(PORTNAME); done @@ -119,13 +113,13 @@ clean: # and (2) the parameters of a database system should be set at initdb time, # not at postgres build time. -install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(EXP) fmgr.h\ +install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\ global1.bki.source local1_template1.bki.source \ libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample $(INSTALL) $(INSTL_EXE_OPTS) postgres $(BINDIR)/postgres ifeq ($(MAKE_EXPORTS), true) - $(INSTALL) $(INSTLOPTS) postgres$(EXPSUFF) $(LIBDIR)/postgres$(EXPSUFF) + $(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(LIBDIR)/$(POSTGRES_IMP) endif @rm -f $(BINDIR)/postmaster cd $(BINDIR); ln -s postgres postmaster diff --git a/src/backend/port/aix/mkldexport.sh b/src/backend/port/aix/mkldexport.sh index 3447ebdf60..87f78b05f4 100755 --- a/src/backend/port/aix/mkldexport.sh +++ b/src/backend/port/aix/mkldexport.sh @@ -33,7 +33,7 @@ if [ -z "$2" ]; then else echo '#!' $2/$OBJNAME fi -$NM -g $1 | \ +$NM -Bg $1 | \ egrep ' [TD] ' | \ sed -e 's/.* //' | \ egrep -v '\$' | \ |