82 lines
2.6 KiB
Text
82 lines
2.6 KiB
Text
$NetBSD: patch-aa,v 1.7 2010/02/04 20:58:45 heinz Exp $
|
|
|
|
--- Makefile.orig 1992-09-10 14:59:31.000000000 +0000
|
|
+++ Makefile
|
|
@@ -8,10 +8,10 @@
|
|
### socket.1 in /usr/local/man/man1/socket.1
|
|
### Make sure the target directories exist before doing a "make install".
|
|
|
|
-INSTALLBASE = /usr/local
|
|
+INSTALLBASE = ${PREFIX}
|
|
INSTALLBINPATH = $(INSTALLBASE)/bin
|
|
INSTALLBINMODE = 755
|
|
-INSTALLMANPATH = $(INSTALLBASE)/man
|
|
+INSTALLMANPATH = $(INSTALLBASE)/$(PKGMANDIR)
|
|
INSTALLMANMODE = 444
|
|
CC = cc
|
|
CFLAGS = $(SWITCHES) -O
|
|
@@ -81,27 +81,25 @@ TAGS: $(PROGSOURCES) $(HEADERS)
|
|
installtargets: $(INSTALLBINPATH)/$(TARGET) installmanuals
|
|
|
|
$(INSTALLBINPATH)/$(TARGET): $(TARGET)
|
|
- @-echo "installing $(TARGET) in $(INSTALLBINPATH)"; \
|
|
- if [ -f $(INSTALLBINPATH)/$(TARGET) ] && \
|
|
- [ ! -w $(INSTALLBINPATH)/$(TARGET) ]; \
|
|
+ @-echo "installing $(TARGET) in $(DESTDIR)$(INSTALLBINPATH)"; \
|
|
+ if [ -f $(DESTDIR)$(INSTALLBINPATH)/$(TARGET) ] && \
|
|
+ [ ! -w $(DESTDIR)$(INSTALLBINPATH)/$(TARGET) ]; \
|
|
then \
|
|
- chmod u+w $(INSTALLBINPATH)/$(TARGET); \
|
|
+ chmod u+w $(DESTDIR)$(INSTALLBINPATH)/$(TARGET); \
|
|
fi; \
|
|
- cp $(TARGET) $(INSTALLBINPATH)/$(TARGET); \
|
|
- chmod $(INSTALLBINMODE) $(INSTALLBINPATH)/$(TARGET);
|
|
+ $(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(INSTALLBINPATH)/$(TARGET)
|
|
|
|
installmanuals: $(MANUALS)
|
|
@-_manuals="$(MAN1)"; \
|
|
for i in $$_manuals; \
|
|
do \
|
|
- echo "installing $$i in $(INSTALLMANPATH)/man1"; \
|
|
- if [ -f $(INSTALLMANPATH)/man1/$$i ] && \
|
|
- [ ! -w $(INSTALLMANPATH)/man1/$$i ]; \
|
|
+ echo "installing $$i in $(DESTDIR)$(INSTALLMANPATH)/man1"; \
|
|
+ if [ -f $(DESTDIR)$(INSTALLMANPATH)/man1/$$i ] && \
|
|
+ [ ! -w $(DESTDIR)$(INSTALLMANPATH)/man1/$$i ]; \
|
|
then \
|
|
- chmod u+w $(INSTALLMANPATH)/man1/$$i; \
|
|
+ chmod u+w $(DESTDIR)$(INSTALLMANPATH)/man1/$$i; \
|
|
fi; \
|
|
- cp $$i $(INSTALLMANPATH)/man1/$$i; \
|
|
- chmod $(INSTALLMANMODE) $(INSTALLMANPATH)/man1/$$i; \
|
|
+ $(BSD_INSTALL_MAN) $$i $(DESTDIR)$(INSTALLMANPATH)/man1/$$i; \
|
|
done
|
|
|
|
doclean:
|
|
@@ -117,7 +115,7 @@ install: +install $(ALLTARGETS)
|
|
clean: +clean $(ALLTARGETS)
|
|
|
|
+all:
|
|
- @-if [ -n "$(ALLTARGETS)" ]; \
|
|
+ @if [ -n "$(ALLTARGETS)" ]; \
|
|
then : ; \
|
|
else \
|
|
$(MAKE) ALLTARGETS="subsystems targets" MAINTARGET=all \
|
|
@@ -137,7 +135,7 @@ clean: +clean $(ALLTARGETS)
|
|
fi
|
|
|
|
+install:
|
|
- @-if [ -n "$(ALLTARGETS)" ]; \
|
|
+ @if [ -n "$(ALLTARGETS)" ]; \
|
|
then : ; \
|
|
else \
|
|
$(MAKE) ALLTARGETS="subsystems installtargets" \
|
|
@@ -158,7 +156,7 @@ clean: +clean $(ALLTARGETS)
|
|
fi
|
|
|
|
+clean:
|
|
- @-if [ -n "$(ALLTARGETS)" ]; \
|
|
+ @if [ -n "$(ALLTARGETS)" ]; \
|
|
then : ; \
|
|
else \
|
|
$(MAKE) ALLTARGETS="subsystems doclean" MAINTARGET=clean \
|