summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorBruce Momjian1998-04-06 16:53:15 +0000
committerBruce Momjian1998-04-06 16:53:15 +0000
commit471dbbc2238701a0191cd3dca1388f4b0a5641e7 (patch)
tree429c3c81b370ee6a87a9854314838541f214d1b7 /src/bin
parent0bf814117227906fc089011420add221f69be5c2 (diff)
DESTDIR removed, again.
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/cleardbdir/Makefile4
-rw-r--r--src/bin/createdb/Makefile4
-rw-r--r--src/bin/createuser/Makefile4
-rw-r--r--src/bin/destroydb/Makefile4
-rw-r--r--src/bin/destroyuser/Makefile4
-rw-r--r--src/bin/initdb/Makefile4
-rw-r--r--src/bin/initlocation/Makefile4
-rw-r--r--src/bin/ipcclean/Makefile4
-rw-r--r--src/bin/pg_dump/Makefile.in6
-rw-r--r--src/bin/pg_id/Makefile4
-rw-r--r--src/bin/pg_passwd/Makefile2
-rw-r--r--src/bin/pg_version/Makefile.in4
-rw-r--r--src/bin/pgtclsh/Makefile6
-rw-r--r--src/bin/psql/Makefile.in4
14 files changed, 29 insertions, 29 deletions
diff --git a/src/bin/cleardbdir/Makefile b/src/bin/cleardbdir/Makefile
index 12e2d1e10b..dc18f00723 100644
--- a/src/bin/cleardbdir/Makefile
+++ b/src/bin/cleardbdir/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/cleardbdir/Attic/Makefile,v 1.7 1998/04/06 01:14:10 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/cleardbdir/Attic/Makefile,v 1.8 1998/04/06 16:49:24 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -20,7 +20,7 @@ cleardbdir:
cp cleardbdir.sh cleardbdir
install: cleardbdir
- $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+ $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
clean:
rm -f cleardbdir
diff --git a/src/bin/createdb/Makefile b/src/bin/createdb/Makefile
index 97e71ea653..5b5fa2dfdf 100644
--- a/src/bin/createdb/Makefile
+++ b/src/bin/createdb/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/createdb/Attic/Makefile,v 1.7 1998/04/06 01:14:13 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/createdb/Attic/Makefile,v 1.8 1998/04/06 16:49:28 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -20,7 +20,7 @@ createdb: createdb.sh
cp createdb.sh createdb
install: createdb
- $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+ $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
clean:
rm -f createdb
diff --git a/src/bin/createuser/Makefile b/src/bin/createuser/Makefile
index f03c925d15..ef3b13eb57 100644
--- a/src/bin/createuser/Makefile
+++ b/src/bin/createuser/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/createuser/Attic/Makefile,v 1.7 1998/04/06 01:14:18 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/createuser/Attic/Makefile,v 1.8 1998/04/06 16:49:37 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -24,7 +24,7 @@ createuser: createuser.sh
sed $(SEDSCRIPT) <createuser.sh >createuser
install: createuser
- $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+ $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
clean:
rm -f createuser
diff --git a/src/bin/destroydb/Makefile b/src/bin/destroydb/Makefile
index 903118db58..ca0551905e 100644
--- a/src/bin/destroydb/Makefile
+++ b/src/bin/destroydb/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/destroydb/Attic/Makefile,v 1.7 1998/04/06 01:14:26 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/destroydb/Attic/Makefile,v 1.8 1998/04/06 16:49:51 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -20,7 +20,7 @@ destroydb: destroydb.sh
cp destroydb.sh destroydb
install: destroydb
- $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+ $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
clean:
rm -f destroydb
diff --git a/src/bin/destroyuser/Makefile b/src/bin/destroyuser/Makefile
index 8311cf50b2..a43959db24 100644
--- a/src/bin/destroyuser/Makefile
+++ b/src/bin/destroyuser/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/Makefile,v 1.7 1998/04/06 01:14:36 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/Makefile,v 1.8 1998/04/06 16:50:05 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -24,7 +24,7 @@ destroyuser: destroyuser.sh
sed $(SEDSCRIPT) <destroyuser.sh >destroyuser
install: destroyuser
- $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+ $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
clean:
rm -f destroyuser
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index 7d673d9282..59000129c2 100644
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.8 1998/04/06 02:10:49 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.9 1998/04/06 16:50:22 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -17,7 +17,7 @@ include ../../Makefile.global
all: initdb
install: initdb
- $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+ $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
clean:
diff --git a/src/bin/initlocation/Makefile b/src/bin/initlocation/Makefile
index bc346b6d28..4ea61f8dc1 100644
--- a/src/bin/initlocation/Makefile
+++ b/src/bin/initlocation/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.4 1998/04/06 01:15:01 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.5 1998/04/06 16:50:30 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -24,7 +24,7 @@ initlocation: initlocation.sh
cp -p initlocation.sh initlocation
install: initlocation
- $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+ $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
clean:
rm -f initlocation
diff --git a/src/bin/ipcclean/Makefile b/src/bin/ipcclean/Makefile
index 86b842c689..74250c0968 100644
--- a/src/bin/ipcclean/Makefile
+++ b/src/bin/ipcclean/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.6 1998/04/06 01:15:09 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.7 1998/04/06 16:50:36 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -23,7 +23,7 @@ ipcclean:
sed $(SEDSCRIPT) <ipcclean.sh >ipcclean
install: ipcclean
- $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+ $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
clean:
rm -f ipcclean
diff --git a/src/bin/pg_dump/Makefile.in b/src/bin/pg_dump/Makefile.in
index efdbf6399c..7aaa9a2f71 100644
--- a/src/bin/pg_dump/Makefile.in
+++ b/src/bin/pg_dump/Makefile.in
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.8 1998/04/06 01:15:16 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.9 1998/04/06 16:50:46 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -39,8 +39,8 @@ submake:
$(MAKE) -C $(LIBPQDIR) libpq.a
install: pg_dump
- $(INSTALL) $(INSTL_EXE_OPTS) pg_dump $(DESTDIR)$(BINDIR)/pg_dump
- $(INSTALL) $(INSTL_EXE_OPTS) pg_dumpall $(DESTDIR)$(BINDIR)/pg_dumpall
+ $(INSTALL) $(INSTL_EXE_OPTS) pg_dump $(BINDIR)/pg_dump
+ $(INSTALL) $(INSTL_EXE_OPTS) pg_dumpall $(BINDIR)/pg_dumpall
depend dep:
$(CC) -MM $(CFLAGS) *.c >depend
diff --git a/src/bin/pg_id/Makefile b/src/bin/pg_id/Makefile
index 6949605943..c98275678c 100644
--- a/src/bin/pg_id/Makefile
+++ b/src/bin/pg_id/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.10 1998/04/06 01:15:24 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.11 1998/04/06 16:51:04 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -33,7 +33,7 @@ $(LIBPQDIR)/libpq.a:
$(MAKE) -C $(LIBPQDIR) libpq.a
install: pg_id
- $(INSTALL) $(INSTL_EXE_OPTS) pg_id $(DESTDIR)$(BINDIR)/pg_id
+ $(INSTALL) $(INSTL_EXE_OPTS) pg_id $(BINDIR)/pg_id
depend dep:
$(CC) -MM $(CFLAGS) *.c >depend
diff --git a/src/bin/pg_passwd/Makefile b/src/bin/pg_passwd/Makefile
index 1ef0960d66..408640fea5 100644
--- a/src/bin/pg_passwd/Makefile
+++ b/src/bin/pg_passwd/Makefile
@@ -15,7 +15,7 @@ pg_passwd: $(OBJS)
$(CC) -o pg_passwd $(OBJS) $(LDFLAGS)
install: pg_passwd
- $(INSTALL) $(INSTL_EXE_OPTS) pg_passwd $(DESTDIR)$(BINDIR)/pg_passwd
+ $(INSTALL) $(INSTL_EXE_OPTS) pg_passwd $(BINDIR)/pg_passwd
.PHONY: submake
submake:
diff --git a/src/bin/pg_version/Makefile.in b/src/bin/pg_version/Makefile.in
index 819dfbccf7..ed0eff2405 100644
--- a/src/bin/pg_version/Makefile.in
+++ b/src/bin/pg_version/Makefile.in
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile.in,v 1.4 1998/04/06 01:15:44 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile.in,v 1.5 1998/04/06 16:51:27 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -28,7 +28,7 @@ submake:
$(MAKE) -C ../../utils version.o
install: pg_version
- $(INSTALL) $(INSTL_EXE_OPTS) pg_version $(DESTDIR)$(BINDIR)/pg_version
+ $(INSTALL) $(INSTL_EXE_OPTS) pg_version $(BINDIR)/pg_version
depend dep:
$(CC) -MM $(CFLAGS) *.c >depend
diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile
index 3aee0223cc..1efe893091 100644
--- a/src/bin/pgtclsh/Makefile
+++ b/src/bin/pgtclsh/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.16 1998/04/06 01:15:51 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.17 1998/04/06 16:51:35 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -37,8 +37,8 @@ pgtksh: pgtkAppInit.o
$(X11_LIBS) -lm $(LDFLAGS)
install: pgtclsh pgtksh
- $(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(DESTDIR)$(BINDIR)/pgtclsh
- $(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(DESTDIR)$(BINDIR)/pgtksh
+ $(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(BINDIR)/pgtclsh
+ $(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(BINDIR)/pgtksh
clean:
rm -f pgtclAppInit.o pgtkAppInit.o pgtclsh pgtksh
diff --git a/src/bin/psql/Makefile.in b/src/bin/psql/Makefile.in
index e01674491e..071ab34c50 100644
--- a/src/bin/psql/Makefile.in
+++ b/src/bin/psql/Makefile.in
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.10 1998/04/06 01:15:55 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.11 1998/04/06 16:51:44 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -39,7 +39,7 @@ submake:
$(MAKE) -C $(LIBPQDIR) libpq.a
install: psql
- $(INSTALL) $(INSTL_EXE_OPTS) psql $(DESTDIR)$(BINDIR)/psql
+ $(INSTALL) $(INSTL_EXE_OPTS) psql $(BINDIR)/psql
depend dep:
$(CC) -MM $(CFLAGS) *.c >depend