Merge pull request #108 from mhei/fix-manpage-default-dir

Change default manpage installation destination to /usr/local hierarchy
qca · May 21, 2017 · 3ec9813 · 3ec9813
2 parents 301c063 + 18db906
commit 3ec9813
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/ether/Makefile b/ether/Makefile
@@ -36,6 +36,7 @@ install: $(TOOLS) library
 	install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
 uninstall:
 	cd ${BIN}; rm -f ${TOOLS}
+	cd ${MAN}; rm -f ${PAGES}
 check:
 	${SHELL} ether.sh
 fresh: clean compile

diff --git a/make.def b/make.def
@@ -67,7 +67,7 @@ STRIP=$(CROSS)strip
 
 ROOTFS?=
 BIN=${ROOTFS}/usr/local/bin
-MAN=${ROOTFS}/usr/share/man/man1
+MAN=${ROOTFS}/usr/local/man/man1
 DOC=${ROOTFS}/home/www/software
 WWW=${ROOTFS}/home/www
 FTP=${ROOTFS}/home/ftp

diff --git a/mme/Makefile b/mme/Makefile
@@ -36,6 +36,7 @@ install: $(TOOLS) library
 	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
 uninstall:
 	cd ${BIN}; rm -f ${TOOLS}
+	cd ${MAN}; rm -f ${PAGES}
 check:
 	${SHELL} mme.sh
 fresh: clean compile

diff --git a/nvm/Makefile b/nvm/Makefile
@@ -36,6 +36,7 @@ install: $(TOOLS) library
 	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
 uninstall:
 	cd ${BIN}; rm -f ${TOOLS}
+	cd ${MAN}; rm -f ${PAGES}
 check:
 	${SHELL} nvm.sh
 fresh: clean compile

diff --git a/pib/Makefile b/pib/Makefile
@@ -37,7 +37,8 @@ library:
 install: $(TOOLS) library
 	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
 uninstall:
-	cd ${BIN}; rm -f ${TOOLS} 
+	cd ${BIN}; rm -f ${TOOLS}
+	cd ${MAN}; rm -f ${PAGES}
 check:
 	${SHELL} pib.sh
 fresh: clean compile

diff --git a/plc/Makefile b/plc/Makefile
@@ -40,8 +40,8 @@ manuals:
 install: $(TOOLS) library
 	install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
 uninstall:
-	cd ${BIN}; rm -f int6k ${TOOLS}
-	cd ${MAN}; rm -f int6k ${PAGES}
+	cd ${BIN}; rm -f ${TOOLS}
+	cd ${MAN}; rm -f ${PAGES}
 check:
 	${SHELL} plc.sh
 fresh: clean compile

diff --git a/slac/Makefile b/slac/Makefile
@@ -35,8 +35,8 @@ manuals:
 install: compile library
 	install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
 uninstall:
-	cd ${BIN}; rm -f plc ${TOOLS}
-	cd ${MAN}; rm -f plc ${PAGES}
+	cd ${BIN}; rm -f ${TOOLS}
+	cd ${MAN}; rm -f ${PAGES}
 clean:
 	rm -f ${TRASH} ${TOOLS}
 check: