From f7f177d372750e4f766ccefdf20e1b30d66cba0a Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 15 Jun 2000 18:55:34 +0000
Subject: /contrib patch from Karel.

---
 contrib/vacuumlo/Makefile   | 54 ++++++++++++++++++++++++++++++++-------------
 contrib/vacuumlo/vacuumlo.c |  4 ++--
 2 files changed, 41 insertions(+), 17 deletions(-)

(limited to 'contrib/vacuumlo')

diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile
index c9484024b5..1e67847b5a 100644
--- a/contrib/vacuumlo/Makefile
+++ b/contrib/vacuumlo/Makefile
@@ -1,24 +1,48 @@
-# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.2 2000/05/29 05:44:32 tgl Exp $
+#
+# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.3 2000/06/15 18:55:31 momjian Exp $
+#
 
-SRCDIR= ../../src
+TOPDIR=../..
 
-include $(SRCDIR)/Makefile.global
+include ../Makefile.global
 
-CONTRIBDIR=$(LIBDIR)/contrib
+NAME	= vacuumlo
 
-CFLAGS+= -I$(LIBPQDIR)
+PROGRAM	= $(NAME)
+OBJS	= $(NAME).o
+DOCS	= $(NAME).doc
+SQLS	= 
+BINS    = $(PROGRAM)
+EXAMPLES=
+MODS	= 
 
-TARGETS= vacuumlo
-CLEANFILES+= $(TARGETS)
-CURDIR=`pwd`
+CFLAGS += -I$(LIBPQDIR)
 
-all:: $(TARGETS)
+OTHER_CLEAN = 
 
-$(TARGETS): vacuumlo.o
-	$(CC) -o vacuumlo -L $(LIBDIR) -lpq -lcrypt vacuumlo.o
+all: $(PROGRAM)
 
-clean: 
-	rm -f $(TARGETS) *.o
+$(PROGRAM): $(OBJS) $(LIBPGEASYDIR)/libpgeasy.a 
+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPGEASY) 
 
-dist:
-	tar cf vacuumlo.tar README Makefile vacuumlo.c
+install: install_doc install_bin 
+
+install_doc:
+	for inst_file in $(DOCS); do \
+		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
+	done
+
+install_bin:
+	for inst_file in $(BINS); do \
+		$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
+	done
+
+depend dep:
+	$(CC) -MM -MG $(CFLAGS) *.c > depend
+
+clean:
+	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
+
+ifeq (depend,$(wildcard depend))
+include depend
+endif
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index 7a0d6d6264..ac41d551c3 100644
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -8,13 +8,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/contrib/vacuumlo/vacuumlo.c,v 1.3 2000/01/26 05:55:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/contrib/vacuumlo/vacuumlo.c,v 1.4 2000/06/15 18:55:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include <strings.h>
+#include <string.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
-- 
cgit v1.2.1