DESTDIR fixing

diff --git a/sys/arch/i386/isa/pcvt/Util/keycap/Makefile b/sys/arch/i386/isa/pcvt/Util/keycap/Makefile
index c3d198b..2bc5c28 100644 (file)
--- a/sys/arch/i386/isa/pcvt/Util/keycap/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/keycap/Makefile
@@ -1,5 +1,5 @@
 LIB    =       keycap
-CAPDIR =       $(DESTDIR)/usr/share/misc
+CAPDIR =       /usr/share/misc
 CAPPATH        =       $(CAPDIR)/keycap.pcvt
 KEYCAPSRC=     keycap.src
 CFLAGS +=      -DKEYCAP_PATH=\"$(CAPPATH)\"
@@ -9,8 +9,10 @@ MAN5   =       keycap.${MAN5EXT}
 #CLEANFILES+=  keycap.0 keycap.0
 
 beforeinstall:
-       @if [ ! -d ${DESTDIR}${LIBDIR} ]; then mkdir ${DESTDIR}${LIBDIR};fi
+       -@if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
+               mkdir ${DESTDIR}${LIBDIR}; \
+       fi
        install -c -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \
-       ${.CURDIR}/${KEYCAPSRC} ${CAPPATH}
+           ${.CURDIR}/${KEYCAPSRC} ${DESTDIR}${CAPPATH}
 
 .include <bsd.lib.mk>