Check for defined before checking for empty, otherwise old make(1) fails

to build during bootstrap.

6 files changed, 12 insertions, 12 deletions

diff --git a/pkgtools/pkg_install/files/add/Makefile.in b/pkgtools/pkg_install/files/add/Makefile.in
index f80e1b78683..9185cd769b3 100644
--- a/pkgtools/pkg_install/files/add/Makefile.in
+++ b/pkgtools/pkg_install/files/add/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.25 2012/03/01 21:40:00 joerg Exp $
+# $NetBSD: Makefile.in,v 1.26 2012/05/15 16:43:53 christos Exp $
 
 srcdir=		@srcdir@
 
@@ -48,7 +48,7 @@ install:
 	$(INSTALL) -m 755 -d ${DESTDIR}$(man1dir)
 	$(INSTALL) $(PROG) ${DESTDIR}$(sbindir)/$(PROG)
 	$(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1
-.if !empty(MANINSTALL:Mcatinstall)
+.if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
 	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0
 .endif
diff --git a/pkgtools/pkg_install/files/admin/Makefile.in b/pkgtools/pkg_install/files/admin/Makefile.in
index 004698e1a52..92e4f0f6c26 100644
--- a/pkgtools/pkg_install/files/admin/Makefile.in
+++ b/pkgtools/pkg_install/files/admin/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.23 2012/03/01 21:40:00 joerg Exp $
+# $NetBSD: Makefile.in,v 1.24 2012/05/15 16:43:53 christos Exp $
 
 srcdir=		@srcdir@
 
@@ -62,7 +62,7 @@ install:
 	$(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1
 	$(INSTALL) -m 444 audit-packages.8 ${DESTDIR}$(man8dir)/
 	$(INSTALL) -m 444 download-vulnerability-list.8 ${DESTDIR}$(man8dir)/
-.if !empty(MANINSTALL:Mcatinstall)
+.if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat8dir)
 	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0
diff --git a/pkgtools/pkg_install/files/create/Makefile.in b/pkgtools/pkg_install/files/create/Makefile.in
index dc71abcb8e7..70ae45751b1 100644
--- a/pkgtools/pkg_install/files/create/Makefile.in
+++ b/pkgtools/pkg_install/files/create/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.21 2012/03/01 21:40:00 joerg Exp $
+# $NetBSD: Makefile.in,v 1.22 2012/05/15 16:43:53 christos Exp $
 
 srcdir=		@srcdir@
 
@@ -49,7 +49,7 @@ install:
 	$(INSTALL) -m 755 -d ${DESTDIR}$(man1dir)
 	$(INSTALL) $(PROG) ${DESTDIR}$(sbindir)/$(PROG)
 	$(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1
-.if !empty(MANINSTALL:Mcatinstall)
+.if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
 	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0
 .endif
diff --git a/pkgtools/pkg_install/files/delete/Makefile.in b/pkgtools/pkg_install/files/delete/Makefile.in
index 6f76421d711..e1b24832330 100644
--- a/pkgtools/pkg_install/files/delete/Makefile.in
+++ b/pkgtools/pkg_install/files/delete/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.18 2012/03/01 21:40:00 joerg Exp $
+# $NetBSD: Makefile.in,v 1.19 2012/05/15 16:43:53 christos Exp $
 
 srcdir=		@srcdir@
 
@@ -41,7 +41,7 @@ install:
 	$(INSTALL) -m 755 -d ${DESTDIR}$(man1dir)
 	$(INSTALL) $(PROG) ${DESTDIR}$(sbindir)/$(PROG)
 	$(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1
-.if !empty(MANINSTALL:Mcatinstall)
+.if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
 	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0
 .endif
diff --git a/pkgtools/pkg_install/files/info/Makefile.in b/pkgtools/pkg_install/files/info/Makefile.in
index f94965bca12..ddf67598bb6 100644
--- a/pkgtools/pkg_install/files/info/Makefile.in
+++ b/pkgtools/pkg_install/files/info/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.24 2012/03/01 21:40:01 joerg Exp $
+# $NetBSD: Makefile.in,v 1.25 2012/05/15 16:43:53 christos Exp $
 
 srcdir=		@srcdir@
 
@@ -52,7 +52,7 @@ install:
 	$(INSTALL) -m 755 -d ${DESTDIR}$(man1dir)
 	$(INSTALL) $(PROG) ${DESTDIR}$(sbindir)/$(PROG)
 	$(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1
-.if !empty(MANINSTALL:Mcatinstall)
+.if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
 	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0
 .endif
diff --git a/pkgtools/pkg_install/files/lib/Makefile.in b/pkgtools/pkg_install/files/lib/Makefile.in
index cb9ac8583bf..2613315eab8 100644
--- a/pkgtools/pkg_install/files/lib/Makefile.in
+++ b/pkgtools/pkg_install/files/lib/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.32 2012/03/01 21:40:01 joerg Exp $
+# $NetBSD: Makefile.in,v 1.33 2012/05/15 16:43:54 christos Exp $
 
 srcdir=		@srcdir@
 
@@ -62,7 +62,7 @@ install:
 	$(INSTALL) -m 444 pkg_summary.5 ${DESTDIR}$(man5dir)/pkg_summary.5
 	$(INSTALL) -m 444 pkg_install.conf.5 ${DESTDIR}$(man5dir)/pkg_install.conf.5
 	$(INSTALL) -m 444 pkgsrc.7 ${DESTDIR}$(man7dir)/pkgsrc.7
-.if !empty(MANINSTALL:Mcatinstall)
+.if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat5dir)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat7dir)
 	$(INSTALL) -m 444 pkg_summary.cat ${DESTDIR}$(cat5dir)/pkg_summary.0