pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

(pkgtools/check-update/INSTALL) Adjust make directory



Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara (CF-S9) <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Thu Mar 30 21:29:36 2017 +0900
Changeset:	7531894d1d30b026ed268e2f1f06271c25deb417

Modified Files:
	check-update/INSTALL
	check-update/Makefile
	check-update/TODO

Log Message:
(pkgtools/check-update/INSTALL) Adjust make directory

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7531894d1d30b026ed268e2f1f06271c25deb417

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 check-update/INSTALL  |  7 ++++---
 check-update/Makefile | 16 ++++++++++------
 check-update/TODO     |  8 ++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diffs:
diff --git a/check-update/INSTALL b/check-update/INSTALL
index ba781d842b..eeeed98858 100644
--- a/check-update/INSTALL
+++ b/check-update/INSTALL
@@ -1,7 +1,8 @@
 #!/bin/sh
-MAKEDIR=${MAKEDIR}
+WRKDIR_FOR_MAKE=${WRKDIR_FOR_MAKE}
 MKDIR=${MKDIR}
 
-if [ ! -d ${MAKEDIR} ]; then
-${MKDIR} -p ${MAKEDIR}
+if [ ! -d ${WRKDIR_FOR_MAKE} ]; then
+${MKDIR} -p ${WRKDIR_FOR_MAKE}
+${MKDIR} -p ${WRKDIR_FOR_MAKE}/htdocs
 fi
diff --git a/check-update/Makefile b/check-update/Makefile
index db38d13d44..82b518606e 100644
--- a/check-update/Makefile
+++ b/check-update/Makefile
@@ -21,15 +21,19 @@ USE_TOOLS+=	perl:run
 NO_BUILD=       YES
 
 CHECK_UPDATE_DIR= share/check-update
-MAKEDIR=	${VARBASE}/check-update
+WRKDIR_FOR_MAKE=	${VARBASE}/check-update
 EGDIR=		share/examples/check-update
 
-CONF_FILES+=	${EGDIR}/Makefile	   ${MAKEDIR}/Makefile
-CONF_FILES+=	${EGDIR}/environment-sample.mk	${MAKEDIR}/environment.mk
-CONF_FILES+=	${EGDIR}/check-update-sample.sh   ${MAKEDIR}/check-update.sh
-CONF_FILES+=	${EGDIR}/cd-and-sh-sample ${MAKEDIR}/cd-and-sh
+CONF_FILES+=	${EGDIR}/Makefile	   	  ${WRKDIR_FOR_MAKE}/Makefile
+CONF_FILES+=	${EGDIR}/environment-sample.mk	  ${WRKDIR_FOR_MAKE}/environment.mk
+CONF_FILES+=	${EGDIR}/check-update-sample.sh   ${WRKDIR_FOR_MAKE}/check-update.sh
+CONF_FILES+=	${EGDIR}/cd-and-sh-sample         ${WRKDIR_FOR_MAKE}/cd-and-sh
 
-OWN_DIRS+=	${MAKEDIR}
+# see INSTALL file also
+OWN_DIRS+=	${WRKDIR_FOR_MAKE}
+OWN_DIRS+=	${WRKDIR_FOR_MAKE}/htdocs
+OWN_DIRS_PERMS+=${WRKDIR_FOR_MAKE}        ${SHAREOWN} ${SHAREGRP} 0755
+OWN_DIRS_PERMS+=${WRKDIR_FOR_MAKE}/htdocs ${SHAREOWN} ${SHAREGRP} 0755
 
 MAKE_FILES=	Makefile environment-sample.mk
 MAKE_SCRIPTS=	cd-and-sh-sample check-update-sample.sh
diff --git a/check-update/TODO b/check-update/TODO
index 19950fc8ec..fb6672b1c7 100644
--- a/check-update/TODO
+++ b/check-update/TODO
@@ -23,3 +23,11 @@ CF-S9@makoto 21:23:15/170329(..wip/check-update)% (cd /var/check-update/; make)
 mkdir: /var/check-update/htdocs/.20170329-12: No such file or directory
 *** Error code 1
 ----------------------
+
+
+* on 2017-03-30 ( my case, using non-standard path /export/CHROOT/usr/pkgsrc)
+   ----------------------
+   sudo pkg_delete -f check-update && make clean && \
+   make package-install && \
+   ( cd /var/check-update; env PKGSRC=/export/CHROOT/usr/pkgsrc make)
+   ----------------------


Home | Main Index | Thread Index | Old Index