libixp

commit beac8507376d3441b05842378e24ee679c8c6741
parent c8c01833a7dba09fdb4f0f2e75f626ad2abb06fc
Author: Kris Maglione <jg@suckless.org>
Date:   Sun,  1 Jul 2007 17:09:14 -0400

Fix install.

Diffstat:
include/ixp.h
 | 
6
+++---
mk/hdr.mk
 | 
17
+++++++++--------
mk/lib.mk
 | 
7
++++---

3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/include/ixp.h b/include/ixp.h
@@ -406,9 +406,9 @@ int ixp_rubyinit(void);
 int ixp_pthread_init(void);
 
 #ifdef VARARGCK
-# pragma varargck	argpos	ixp_print	3
-# pragma varargck	argpos	ixp_werrstr	2
-# pragma varargck	argpos	ixp_eprint	2
+# pragma varargck	argpos	ixp_print	2
+# pragma varargck	argpos	ixp_werrstr	1
+# pragma varargck	argpos	ixp_eprint	1
 #endif
 
 /* client.c */
diff --git a/mk/hdr.mk b/mk/hdr.mk
@@ -32,35 +32,35 @@ all:
 	chmod 0755 $@
 
 .O.install:
-	echo INSTALL ${BASE}$*
+	echo INSTALL $$($(CLEANNAME) ${BASE}$*)
 	cp -f $< ${BIN}/$*
 	chmod 0755 ${BIN}/$* 
 .O.uninstall:
-	echo UNINSTALL ${BASE}$*
+	echo UNINSTALL $$($(CLEANNAME) ${BASE}$*)
 	rm -f ${BIN}/$* 
 
 .a.install:
-	echo INSTALL ${BASE}$<
+	echo INSTALL $$($(CLEANNAME) ${BASE}$<)
 	cp -f $< ${LIBDIR}/$<
 	chmod 0644 ${LIBDIR}/$<
 .a.uninstall:
-	echo UNINSTALL ${BASE}$<
+	echo UNINSTALL $$($(CLEANNAME) ${BASE}$<)
 	rm -f ${LIBDIR}/$<
 
 .h.install:
-	echo INSTALL ${BASE}$<
+	echo INSTALL $$($(CLEANNAME) ${BASE}$<)
 	cp -f $< ${INCLUDE}/$<
 	chmod 0644 ${INCLUDE}/$<
 .h.uninstall:
-	echo UNINSTALL ${BASE}$<
+	echo UNINSTALL $$($(CLEANNAME) ${BASE}$<)
 	rm -f ${INCLUDE}/$<
 
 .1.install:
-	echo INSTALL man $*'(1)'
+	echo INSTALL man $$($(CLEANNAME) $*'(1)')
 	${FILTER} $< >${MAN}/man1/$<
 	chmod 0644 ${MAN}/man1/$<
 .1.uninstall:
-	echo UNINSTALL man $*'(1)'
+	echo UNINSTALL man $$($(CLEANNAME) $*'(1)')
 	rm -f ${MAN}/man1/$<
 
 .O.clean:
@@ -78,6 +78,7 @@ depend: cleandep
 FILTER = cat
 COMPILE= CC="${CC}" CFLAGS="${CFLAGS}" ${ROOT}/util/compile
 LINK= LD="${LD}" LDFLAGS="${LDFLAGS}" ${ROOT}/util/link
+CLEANNAME=${ROOT}/util/cleanname
 
 include ${ROOT}/config.mk
 CFLAGS += -I$$(echo ${INCPATH}|sed 's/:/ -I/g')
diff --git a/mk/lib.mk b/mk/lib.mk
@@ -1,10 +1,11 @@
-LIB = ${ROOT}/lib/${TARG}.a
+PTARG = ${ROOT}/lib/${TARG}
+LIB = ${PTARG}.a
 OFILES = ${OBJ:=.o}
 
 all: ${HFILES} ${LIB} 
 
-install: ${TARG}.install
-uninstall: ${TARG}.uninstall
+install: ${PTARG}.install
+uninstall: ${PTARG}.uninstall
 clean: libclean
 depend: ${OBJ:=.depend}