From b453c55f967aa839dcd18794f5d9e0625c752c6d Mon Sep 17 00:00:00 2001
From: "pancake ;)" <poppnk@users.sourceforge.net>
Date: Mon, 21 Feb 2005 14:19:18 +0000
Subject: [PATCH] fix MAKE path for non-netbsd systems nb2

---
 pkg_select/Makefile        | 9 +++++----
 pkg_select/files/Makefile  | 2 +-
 pkg_select/files/pkg_adm.h | 4 +++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkg_select/Makefile b/pkg_select/Makefile
index 855f32ac32..b8dfba6722 100644
--- a/pkg_select/Makefile
+++ b/pkg_select/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/02/21 14:11:25 poppnk Exp $
+# $NetBSD: Makefile,v 1.3 2005/02/21 14:19:18 poppnk Exp $
 #
 
 DISTNAME=	pkg_select-20050221
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -32,8 +32,9 @@ do-install:
 SUBST_CLASSES=		path
 SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	Makefile pkg_select.1
-SUBST_SED.path=         -e "s|/usr/pkgsrc|${PKGSRCDIR}|g"		\
-			-e "s|/var/db/pkg|${PKG_DBDIR}|g"
+SUBST_SED.path=         -e "s|/usr/pkgsrc|${PKGSRCDIR}|g" \
+			-e "s|/var/db/pkg|${PKG_DBDIR}|g" \
+			-e "s|/usr/bin/make|${MAKE}|g"
 SUBST_MESSAGE.path=     "Adjusting path."
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkg_select/files/Makefile b/pkg_select/files/Makefile
index 2f619e5037..abc92046d2 100644
--- a/pkg_select/files/Makefile
+++ b/pkg_select/files/Makefile
@@ -5,7 +5,7 @@ SRCS=	main.c parsedirs.c tools.c file.c more.c listmgt.c \
 WARNS=	3
 
 CFLAGS+=	-g
-CFLAGS+=	-DPKGSRCBASE=\"/usr/pkgsrc\" -DPKGDB=\"/var/db/pkg\"
+CFLAGS+=	-DPKGSRCBASE=\"/usr/pkgsrc\" -DPKGDB=\"/var/db/pkg\" -DMAKE=\"/usr/bin/make\"
 
 LDADD=	-lcurses
 DPADD=	${LIBCURSES}
diff --git a/pkg_select/files/pkg_adm.h b/pkg_select/files/pkg_adm.h
index 61427f7492..c0dd0525aa 100644
--- a/pkg_select/files/pkg_adm.h
+++ b/pkg_select/files/pkg_adm.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pkg_adm.h,v 1.1.1.1 2005/02/21 10:38:07 imilh Exp $ 
+ * $Id: pkg_adm.h,v 1.2 2005/02/21 14:19:31 poppnk Exp $ 
  */
 
 extern void free_pkgdb(void);
@@ -44,7 +44,9 @@ extern char *getpkginfo(char *, int);
 
 #define DEFAULT_PKG_PATH "ftp://ftp.netbsd.org/pub/NetBSD/packages"
 #define PKGTOOLS_PATH "/usr/sbin"
+#ifndef MAKE
 #define MAKE "/usr/bin/make"
+#endif
 
 #define PKG_VERSION 0
 #define PKG_CATEGORY 1