diff options
Diffstat (limited to 'src/backend/utils/fmgr')
-rw-r--r-- | src/backend/utils/fmgr/Makefile | 11 | ||||
-rw-r--r-- | src/backend/utils/fmgr/dfmgr.c | 8 |
2 files changed, 6 insertions, 13 deletions
diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile index a449b80942b..ad96b1717db 100644 --- a/src/backend/utils/fmgr/Makefile +++ b/src/backend/utils/fmgr/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/fmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.11 2001/05/17 17:44:18 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.12 2001/09/16 16:11:11 petere Exp $ # #------------------------------------------------------------------------- @@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global OBJS = dfmgr.o fmgr.o -override CPPFLAGS += -DLIBDIR=\"$(libdir)\" -DDLSUFFIX=\"$(DLSUFFIX)\" +override CPPFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\" -DDLSUFFIX=\"$(DLSUFFIX)\" all: SUBSYS.o @@ -22,12 +22,5 @@ all: SUBSYS.o SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) -depend dep: - $(CC) -MM $(CFLAGS) *.c >depend - clean: rm -f SUBSYS.o $(OBJS) - -ifeq (depend,$(wildcard depend)) -include depend -endif diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index 0448632aadb..2e3cb9ed2dc 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.50 2001/05/19 09:01:10 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.51 2001/09/16 16:11:11 petere Exp $ * *------------------------------------------------------------------------- */ @@ -224,8 +224,8 @@ file_exists(const char *name) #endif /* Example format: "/usr/local/pgsql/lib" */ -#ifndef LIBDIR -#error "LIBDIR needs to be defined to compile this file." +#ifndef PKGLIBDIR +#error "PKGLIBDIR needs to be defined to compile this file." #endif @@ -297,7 +297,7 @@ substitute_libpath_macro(const char * name) macroname_len = strcspn(name + 1, "/") + 1; if (strncmp(name, "$libdir", macroname_len)==0) - replacement = LIBDIR; + replacement = PKGLIBDIR; else elog(ERROR, "invalid macro name in dynamic library path"); |