version set to pre1

use allways prefix $DEST
This commit is contained in:
keil 2000-06-08 10:06:01 +00:00
parent 777d53ecf8
commit 704dc25d08
7 changed files with 20 additions and 20 deletions

View File

@ -125,7 +125,7 @@ $(DE_OUT_NAME).txt.gz: $(DE_OUT_TXT)
# Install output files # Install output files
install: all install: all
if [ -n "$(TARGET_DIR)" ]; then \ if [ -n "$(DESTDIR)$(TARGET_DIR)" ]; then \
$(INSTALL) -m 0755 -d $(DESTDIR)$(TARGET_DIR); \ $(INSTALL) -m 0755 -d $(DESTDIR)$(TARGET_DIR); \
$(INSTALL) -m 0644 $(SRC) $(DESTDIR)$(TARGET_DIR); \ $(INSTALL) -m 0644 $(SRC) $(DESTDIR)$(TARGET_DIR); \
$(INSTALL) -m 0644 $(OUT_TXT) $(DESTDIR)$(TARGET_DIR); \ $(INSTALL) -m 0644 $(OUT_TXT) $(DESTDIR)$(TARGET_DIR); \

View File

@ -1,11 +1,11 @@
# $Id: Makefile,v 1.43 2000/05/18 15:22:09 calle Exp $ # $Id: Makefile,v 1.44 2000/06/08 10:06:01 keil Exp $
# #
# Toplevel Makefile for isdn4k-utils # Toplevel Makefile for isdn4k-utils
# #
.EXPORT_ALL_VARIABLES: .EXPORT_ALL_VARIABLES:
export I4LVERSION = 3.1beta8 export I4LVERSION = 3.1pre1
all: do-it-all all: do-it-all

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.13 1999/10/15 11:12:00 keil Exp $ # $Id: Makefile,v 1.14 2000/06/08 10:06:01 keil Exp $
-include Rules.make -include Rules.make
@ -57,13 +57,13 @@ configureclean: distclean
install: install:
make -C src install make -C src install
ifeq ($(CONFIG_EFT_INSTALL_EFTD_SH),y) ifeq ($(CONFIG_EFT_INSTALL_EFTD_SH),y)
cd scripts && $(INSTALL_SCRIPT) eftd.sh $(SYSVINIT_RC_DIR)/ cd scripts && $(INSTALL_SCRIPT) eftd.sh $(DESTDIR)$(SYSVINIT_RC_DIR)/
endif endif
ifeq ($(CONFIG_EFT_INSTALL_CONF),y) ifeq ($(CONFIG_EFT_INSTALL_CONF),y)
cd examples && $(INSTALL_DATA) eft.conf $(I4LCONFDIR)/ cd examples && $(INSTALL_DATA) eft.conf $(DESTDIR)$(I4LCONFDIR)/
endif endif
@if test -f /etc/ftpaccess; then test -e $(I4LCONFDIR)/eftaccess || ln -s /etc/ftpaccess $(I4LCONFDIR)/eftaccess; fi @if test -f /etc/ftpaccess; then test -e $(DESTDIR)$(I4LCONFDIR)/eftaccess || ln -sf /etc/ftpaccess $(DESTDIR)$(I4LCONFDIR)/eftaccess; fi
@if test -f /etc/ftpusers; then test -e $(I4LCONFDIR)/eftusers || ln -s /etc/ftpusers $(I4LCONFDIR)/eftusers; fi @if test -f /etc/ftpusers; then test -e $(DESTDIR)$(I4LCONFDIR)/eftusers || ln -sf /etc/ftpusers $(DESTDIR)$(I4LCONFDIR)/eftusers; fi
commit: distclean configure commit: distclean configure
$(CVS) commit . $(CVS) commit .

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.2 1999/10/08 00:31:05 he Exp $ # $Id: Makefile,v 1.3 2000/06/08 10:06:01 keil Exp $
default: eftd default: eftd
@ -45,7 +45,7 @@ eftd: eftd.o
$(LINK.o) eftd.o $(EFT_LIBDIR_FLAGS) $(AUTH_LIB) -left $(CRYPTLIB) -o eftd $(LINK.o) eftd.o $(EFT_LIBDIR_FLAGS) $(AUTH_LIB) -left $(CRYPTLIB) -o eftd
install: eftd install: eftd
$(INSTALL_PROGRAM) eftd $(SBINDIR)/ $(INSTALL_PROGRAM) eftd $(DESTDIR)$(SBINDIR)/
.PHONY: clean default install .PHONY: clean default install

View File

@ -1,4 +1,4 @@
#$Id: Makefile,v 1.3 1999/10/08 00:31:06 he Exp $ #$Id: Makefile,v 1.4 2000/06/08 10:06:02 keil Exp $
# This Makefile uses GNU-make extensions # This Makefile uses GNU-make extensions
default: eftp default: eftp
@ -35,9 +35,9 @@ eftp: eftp.o $(READLINE_O)
$(LINK.C) eftp.o $(EFT_LIBDIR_FLAGS) $(READLINE_LDFLAGS) -left -o eftp $(LINK.C) eftp.o $(EFT_LIBDIR_FLAGS) $(READLINE_LDFLAGS) -left -o eftp
install: eftp install: eftp
$(INSTALL_PROGRAM) eftp $(BINDIR)/ $(INSTALL_PROGRAM) eftp $(DESTDIR)$(BINDIR)/
ifeq ($(CONFIG_EFTP_SETUID),y) ifeq ($(CONFIG_EFTP_SETUID),y)
chmod u+s $(BINDIR)/eftp chmod u+s $(DESTDIR)$(BINDIR)/eftp
endif endif
clean: clean:

View File

@ -1,9 +1,9 @@
CC = gcc CC = gcc
CFLAGS = -O2 -Wall -fPIC -L../capi20 CFLAGS = -O2 -Wall -fPIC -I../capi20 -L../capi20
LDFLAGS = -shared LDFLAGS = -shared -L../capi20
PLUGINDIR=/etc/ppp/plugins PLUGINDIR=${DESTDIR}/etc/ppp/plugins
PEERDIR=/etc/ppp/peers/isdn PEERDIR=${DESTDIR}/etc/ppp/peers/isdn
PEERS= arcor otelo talkline avm avm-ml PEERS= arcor otelo talkline avm avm-ml
INSTALL=./install-sh -c INSTALL=./install-sh -c

View File

@ -1,5 +1,5 @@
# #
# $Id: Makefile.in,v 1.21 1999/10/15 15:43:27 keil Exp $ # $Id: Makefile.in,v 1.22 2000/06/08 10:06:03 keil Exp $
#----------------------------------------------------------------------------# #----------------------------------------------------------------------------#
# Things you can change to personalize the Makefile for your own site. Some # # Things you can change to personalize the Makefile for your own site. Some #
@ -186,14 +186,14 @@ programs-i: ignore
@$(INSTALL_UBIN) $(TOPDIR)/src/vboxbeep $(DESTDIR)$(bindir)/vboxbeep @$(INSTALL_UBIN) $(TOPDIR)/src/vboxbeep $(DESTDIR)$(bindir)/vboxbeep
@echo "Installing '$(DESTDIR)$(bindir)/vbox'..." @echo "Installing '$(DESTDIR)$(bindir)/vbox'..."
@$(INSTALL_BIN) $(TOPDIR)/src/vbox $(DESTDIR)$(bindir)/vbox @$(INSTALL_BIN) $(TOPDIR)/src/vbox $(DESTDIR)$(bindir)/vbox
@set -e; if [ -n "$(DESTDIR)" -o -f $(DESTDIR)$(sysconfdir)/vboxgetty.conf ]; then \ @set -e; if [ -z "$(DESTDIR)" -a -f $(DESTDIR)$(sysconfdir)/vboxgetty.conf ]; then \
echo "Installing '$(DESTDIR)$(sysconfdir)/vboxgetty.conf.new'..."; \ echo "Installing '$(DESTDIR)$(sysconfdir)/vboxgetty.conf.new'..."; \
$(INSTALL_SYSCONF) $(TOPDIR)/examples/vboxgetty.conf.example $(DESTDIR)$(sysconfdir)/vboxgetty.conf.new; \ $(INSTALL_SYSCONF) $(TOPDIR)/examples/vboxgetty.conf.example $(DESTDIR)$(sysconfdir)/vboxgetty.conf.new; \
else \ else \
echo "Installing '$(DESTDIR)$(sysconfdir)/vboxgetty.conf'..."; \ echo "Installing '$(DESTDIR)$(sysconfdir)/vboxgetty.conf'..."; \
$(INSTALL_SYSCONF) $(TOPDIR)/examples/vboxgetty.conf.example $(DESTDIR)$(sysconfdir)/vboxgetty.conf; \ $(INSTALL_SYSCONF) $(TOPDIR)/examples/vboxgetty.conf.example $(DESTDIR)$(sysconfdir)/vboxgetty.conf; \
fi fi
@set -e; if [ -n "$(DESTDIR)" -o -f $(DESTDIR)$(sysconfdir)/vboxd.conf ]; then \ @set -e; if [ -z "$(DESTDIR)" -a -f $(DESTDIR)$(sysconfdir)/vboxd.conf ]; then \
echo "Installing '$(DESTDIR)$(sysconfdir)/vboxd.conf.new'..."; \ echo "Installing '$(DESTDIR)$(sysconfdir)/vboxd.conf.new'..."; \
$(INSTALL_SYSCONF) $(TOPDIR)/examples/vboxd.conf.example $(DESTDIR)$(sysconfdir)/vboxd.conf.new; \ $(INSTALL_SYSCONF) $(TOPDIR)/examples/vboxd.conf.example $(DESTDIR)$(sysconfdir)/vboxd.conf.new; \
else \ else \