Some fixes for DESTDIR install support. From Jos Vos <jos@xos.nl>

This commit is contained in:
paul 1998-11-09 12:40:03 +00:00
parent ad4baea1b4
commit 5bf7387a67
4 changed files with 14 additions and 7 deletions

View File

@ -6,7 +6,7 @@
ifeq (../.config,$(wildcard ../.config))
include ../.config
DATAOPTS := DATATARGET=$(shell echo $(CONFIG_DATADIR))/areacodes
DATAOPTS := DATATARGET=$(shell echo $(DESTDIR)$(CONFIG_DATADIR))/areacodes
#
# Install as root with numeric Id's, since these are the
# only ones that _really_ exist on _every_ system.

View File

@ -1,9 +1,12 @@
# $Id: Makefile.in,v 1.3 1998/08/30 09:57:13 calle Exp $
# $Id: Makefile.in,v 1.4 1998/11/09 12:40:13 paul Exp $
#
# Makefile for libcapi20
# (C) 1998 Carsten Paeth
#
# $Log: Makefile.in,v $
# Revision 1.4 1998/11/09 12:40:13 paul
# Some fixes for DESTDIR install support. From Jos Vos <jos@xos.nl>
#
# Revision 1.3 1998/08/30 09:57:13 calle
# I hope it is know readable for everybody.
#
@ -23,8 +26,10 @@ INSTALL_DATA := $(INSTALL) -m 0644 -o 0 -g 0
all: libcapi20.a
install: all
$(INSTALL_DATA) libcapi20.a $(LIBDIR)
$(INSTALL_DATA) capi20.h $(INCLUDEDIR)
[ -d $(DESTDIR)$(LIBDIR) ] || mkdir -p $(DESTDIR)$(LIBDIR)
[ -d $(DESTDIR)$(INCLUDEDIR) ] || mkdir -p $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DATA) libcapi20.a $(DESTDIR)$(LIBDIR)
$(INSTALL_DATA) capi20.h $(DESTDIR)$(INCLUDEDIR)
ifeq (.depend,$(wildcard .depend))
include .depend

View File

@ -1,5 +1,5 @@
#
# $Id: Makefile.in,v 1.16 1998/09/26 18:31:03 akool Exp $
# $Id: Makefile.in,v 1.17 1998/11/09 12:40:19 paul Exp $
#----------------------------------------------------------------------------#
# Things you can change to personalize the Makefile for your own site. Some #
@ -212,7 +212,7 @@ DIRECTORIES_I = $(prefix) \
directories-i: ignore
@set -e; for i in `echo $(DIRECTORIES_I)`; do \
if [ ! -d $$i ]; then \
if [ ! -d $(DESTDIR)$$i ]; then \
$(INSTALL_DIRS) $(DESTDIR)$$i; \
fi; \
done

View File

@ -12,6 +12,8 @@ LOCAL_LIBRARIES = XawClientLibs
ComplexProgramTarget(xmonisdn)
install.bitmap:
[ -d $(DESTDIR)$(INCROOT)/X11/bitmaps ] ||
mkdir -p $(DESTDIR)$(INCROOT)/X11/bitmaps
$(INSTALL) $(INSTALLFLAGS) -m 644 netinactive netwaiting netactive netactiveout netstart netstop $(DESTDIR)$(INCROOT)/X11/bitmaps/
install.all: install install.man install.bitmap
install.all: install install.man install.bitmap