diff -uNbr pgeasy-3.0.1/Makefile pgeasy-3.0.1-patched/Makefile --- pgeasy-3.0.1/Makefile Tue Nov 26 23:40:19 2002 +++ pgeasy-3.0.1-patched/Makefile Mon Dec 30 21:28:41 2002 @@ -9,29 +9,32 @@ SO_MAJOR_VERSION= 3 SO_MINOR_VERSION= 0 -POSTGRES_HOME=/usr/local/pgsql +POSTGRES_HOME=@PREFIX@ TARGET= libpgeasy -CFLAGS= -O -Wall +CFLAGS= -O -Wall -Wmissing-prototypes -Wmissing-declarations -fno-common -traditional-cpp LIBS=pq OBJS= libpgeasy.o halt.o -SHARED= -fpic -shared -Wl,-x,-soname,$(TARGET).so.$(SO_MAJOR_VERSION) -Wl,-rpath,$(POSTGRES_HOME)/lib -soname=$(TARGET).so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) +SHARED= -install_name $(POSTGRES_HOME)/lib/$(TARGET).$(SO_MAJOR_VERSION).dylib -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) -dynamiclib -multiply_defined suppress + +soname=$(TARGET).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).dylib all: $(soname) $(soname) : $(OBJS) - $(CC) $(OBJS) -L$(POSTGRES_HOME)/lib -l$(LIBS) $(SHARED) -o $(soname) + $(CC) $(OBJS) -L$(DESTDIR)$(POSTGRES_HOME)/lib -L$(POSTGRES_HOME)/lib -l$(LIBS) $(SHARED) -o $(soname) %.o : %.c - $(CC) -c $(CFLAGS) -I$(POSTGRES_HOME)/include $< + $(CC) -c $(CFLAGS) -I$(DESTDIR)$(POSTGRES_HOME)/include/postgresql -I$(DESTDIR)$(POSTGRES_HOME)/include -I$(POSTGRES_HOME)/include $< clean: rm -f $(OBJS) $(soname) install: - install $(soname) $(POSTGRES_HOME)/lib - rm -f $(POSTGRES_HOME)/lib/$(TARGET).so - ln -s $(POSTGRES_HOME)/lib/$(soname) $(POSTGRES_HOME)/lib/$(TARGET).so - install -c $(TARGET).h $(POSTGRES_HOME)/include + install -d -m 755 $(DESTDIR)$(POSTGRES_HOME)/lib + install -c -m 755 $(soname) $(DESTDIR)$(POSTGRES_HOME)/lib + rm -f $(DESTDIR)$(POSTGRES_HOME)/lib/$(TARGET).dylib + ln -sf $(soname) $(DESTDIR)$(POSTGRES_HOME)/lib/$(TARGET).dylib + ln -sf $(soname) $(DESTDIR)$(POSTGRES_HOME)/lib/$(TARGET).$(SO_MAJOR_VERSION).dylib + install -c $(TARGET).h $(DESTDIR)$(POSTGRES_HOME)/include/postgresql