Bugfix: Changes for bash-2.00.0:
workaround for empty list in for-loops.
workaround for missing allow_null_glob_expansion
Bugfix: CONFIG_HASX11 was not reset on non-X11 systems.
This commit is contained in:
fritz
parent
ad7cf76cf2
commit
2a62aa9e4f
|
|
@ -179,7 +179,7 @@ install: all
|
|||
|
||||
# Un-install output files
|
||||
uninstall:
|
||||
set -e; allow_null_glob_expansion=1; \
|
||||
set -e; \
|
||||
if [ $(TARGET_DIR) != $(GEN_DIR) ]; then \
|
||||
cd $(TARGET_DIR); \
|
||||
for i in $(OUT_7BIT) $(OUT_HTML) $(OUT_ENG_7BIT) $(OUT_ENG_HTML) ; do \
|
||||
|
|
@ -192,7 +192,7 @@ clean:
|
|||
if [ -e *~ ]; then rm *~; fi
|
||||
if [ -e \#* ]; then rm \#*; fi
|
||||
if [ -e *.orig ]; then rm *.orig; fi
|
||||
set -e; allow_null_glob_expansion=1; \
|
||||
set -e; \
|
||||
cd $(GEN_DIR); \
|
||||
for i in $(OUT_7BIT) $(OUT_HTML) $(OUT_ENG_7BIT) $(OUT_ENG_HTML) ; do \
|
||||
rm -f $$i $$i.zip $$i.gz ; \
|
||||
|
|
|
|||
46
Makefile
46
Makefile
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: Makefile,v 1.12 1997/03/24 23:38:37 fritz Exp $
|
||||
# $Id: Makefile,v 1.13 1997/04/03 08:56:40 fritz Exp $
|
||||
#
|
||||
# Toplevel Makefile for isdn4k-utils
|
||||
#
|
||||
|
|
@ -84,7 +84,7 @@ ifneq ($(SUBDIRS),)
|
|||
endif
|
||||
|
||||
subtargets: $(CONFIGURATION)
|
||||
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i all; done
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i all; done
|
||||
|
||||
rootperm:
|
||||
@echo 'main(int argc,char**argv){unlink(argv[0]);return(getuid()==0);}'>g
|
||||
|
|
@ -94,28 +94,36 @@ rootperm:
|
|||
fi
|
||||
|
||||
install: rootperm
|
||||
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i install; done
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done
|
||||
|
||||
uninstall: rootperm
|
||||
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i uninstall; done
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done
|
||||
|
||||
#
|
||||
# targets clean and distclean go through ALL directories
|
||||
# regardless of cofigured options.
|
||||
#
|
||||
clean:
|
||||
-set -e; allow_null_glob_expansion=1; \
|
||||
for i in */Makefile; do $(MAKE) -i -C `dirname $$i` clean; done; \
|
||||
for i in */GNUmakefile; do $(MAKE) -i -C `dirname $$i` clean; done; \
|
||||
-set -e; \
|
||||
for i in `echo ${wildcard */Makefile}`; do \
|
||||
$(MAKE) -i -C `dirname $$i` clean; \
|
||||
done; \
|
||||
for i in `echo ${wildcard */GNUmakefile}`; do \
|
||||
$(MAKE) -i -C `dirname $$i` clean; \
|
||||
done; \
|
||||
rm -f *~ *.o
|
||||
|
||||
distclean: clean
|
||||
-$(MAKE) -C scripts/lxdialog clean
|
||||
-set -e; allow_null_glob_expansion=1; \
|
||||
for i in */Makefile; do $(MAKE) -i -C `dirname $$i` distclean; done; \
|
||||
for i in */GNUmakefile; do $(MAKE) -i -C `dirname $$i` distclean; done; \
|
||||
-set -e; \
|
||||
for i in `echo ${wildcard */Makefile}`; do \
|
||||
$(MAKE) -i -C `dirname $$i` distclean; \
|
||||
done; \
|
||||
for i in `echo ${wildcard */GNUmakefile}`; do \
|
||||
$(MAKE) -i -C `dirname $$i` distclean; \
|
||||
done; \
|
||||
rm -f *~ .config .config.old scripts/autoconf.h .menuconfig \
|
||||
Makefile.tmp .menuconfig.log scripts/defconfig.old
|
||||
Makefile.tmp .menuconfig.log scripts/defconfig.old .#* scripts/.#*
|
||||
|
||||
scripts/lxdialog/lxdialog:
|
||||
@$(MAKE) -C scripts/lxdialog all
|
||||
|
|
@ -128,7 +136,7 @@ scripts/lxdialog/lxdialog:
|
|||
#
|
||||
subconfig:
|
||||
@echo Selected subdirs: $(SUBDIRS)
|
||||
@set -e; for i in $(SUBDIRS); do \
|
||||
@set -e; for i in `echo $(SUBDIRS)`; do \
|
||||
if [ -x $$i/configure ] ; then \
|
||||
echo -e "\nRunning configure in $$i ...\n"; sleep 1; \
|
||||
(cd $$i; ./configure); \
|
||||
|
|
@ -167,15 +175,15 @@ mrproper: distclean
|
|||
|
||||
archive: distclean
|
||||
@(cd .. ;\
|
||||
mv isdn4k-utils isdn4k-utils-$(I4LVERSION) ;\
|
||||
tar cvzf distisdn/isdn4k-utils-$(I4LVERSION).tar.gz isdn4k-utils-$(I4LVERSION) ;\
|
||||
mv isdn4k-utils-$(I4LVERSION) isdn4k-utils )
|
||||
ln -nfs isdn4k-utils isdn4k-utils-$(I4LVERSION) ;\
|
||||
tar cvhzf distisdn/isdn4k-utils-$(I4LVERSION).tar.gz isdn4k-utils-$(I4LVERSION) ;\
|
||||
rm isdn4k-utils-$(I4LVERSION) )
|
||||
|
||||
distarch: distclean
|
||||
@(cd .. ;\
|
||||
mv isdn4k-utils isdn4k-utils-$(I4LVERSION) ;\
|
||||
tar -cvzf --exclude=CVS distisdn/isdn4k-utils-$(I4LVERSION).tar.gz \
|
||||
(cd .. ;\
|
||||
ln -nfs isdn4k-utils isdn4k-utils-$(I4LVERSION) ;\
|
||||
tar -cvhz --exclude=CVS -f distisdn/isdn4k-utils-$(I4LVERSION).tar.gz \
|
||||
isdn4k-utils-$(I4LVERSION) ;\
|
||||
mv isdn4k-utils-$(I4LVERSION) isdn4k-utils )
|
||||
rm isdn4k-utils-$(I4LVERSION) )
|
||||
|
||||
dist: distarch
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: Makefile.in,v 1.3 1997/03/23 12:03:11 fritz Exp $
|
||||
# $Id: Makefile.in,v 1.4 1997/04/03 08:56:50 fritz Exp $
|
||||
#
|
||||
# Makefile for avmcapictrl
|
||||
# (C) 1997 Carsten Paeth
|
||||
|
|
@ -24,6 +24,7 @@ ifeq (../.config,$(wildcard ../.config))
|
|||
MANPAGES += avmcapictrl.8
|
||||
endif
|
||||
else
|
||||
PROGRAMS = avmcapictrl
|
||||
MANPAGES = avmcapictrl.8
|
||||
SBINDIR = /sbin
|
||||
mandir = @mandir@
|
||||
|
|
@ -55,10 +56,10 @@ install-strip: $(PROGRAMS) $(MANPAGES)
|
|||
$(INSTALL_MAN) $(MANPAGES) $(MAN8DIR)
|
||||
|
||||
uninstall:
|
||||
@for i in $(PROGRAMS) ; do \
|
||||
@for i in `echo $(PROGRAMS)` ; do \
|
||||
rm -f $(SBINDIR)/$$i ; \
|
||||
done
|
||||
@for i in $(MANPAGES) ; do \
|
||||
@for i in `echo $(MANPAGES)` ; do \
|
||||
rm -f $(MAN8DIR)/$$i ; \
|
||||
done
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#
|
||||
# (c) 1995-97 Volker Götz
|
||||
#
|
||||
# $Id: Makefile,v 1.1 1997/03/03 04:10:10 fritz Exp $
|
||||
# $Id: Makefile,v 1.2 1997/04/03 08:56:54 fritz Exp $
|
||||
|
||||
ifeq (../.config,$(wildcard ../.config))
|
||||
#
|
||||
|
|
@ -31,7 +31,8 @@ imontty: imontty.c imontty.h
|
|||
cc $(CCFLAGS) -o imontty imontty.c
|
||||
|
||||
rootperm:
|
||||
@if [ `id -u` != 0 ] ; then \
|
||||
@echo 'main(int argc,char**argv){unlink(argv[0]);return(getuid()==0);}'>g
|
||||
@if gcc -x c -o G g && rm -f g && ./G ; then \
|
||||
echo -e "\n\n Need root permission for (de)installation!\n\n"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
## $Id: Makefile.in,v 1.5 1997/03/24 22:52:00 luethje Exp $
|
||||
## $Id: Makefile.in,v 1.6 1997/04/03 08:56:58 fritz Exp $
|
||||
##
|
||||
## ISDN accounting for isdn4linux.
|
||||
##
|
||||
|
|
@ -19,6 +19,12 @@
|
|||
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
##
|
||||
## $Log: Makefile.in,v $
|
||||
## Revision 1.6 1997/04/03 08:56:58 fritz
|
||||
## Bugfix: Changes for bash-2.00.0:
|
||||
## workaround for empty list in for-loops.
|
||||
## workaround for missing allow_null_glob_expansion
|
||||
## Bugfix: CONFIG_HASX11 was not reset on non-X11 systems.
|
||||
##
|
||||
## Revision 1.5 1997/03/24 22:52:00 luethje
|
||||
## isdnrep completed.
|
||||
##
|
||||
|
|
@ -177,16 +183,16 @@ PROGS = $(ISDNLOG) $(ISDNREP) $(ISDNCONF)
|
|||
all: libs $(PROGS)
|
||||
|
||||
libs:
|
||||
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i; done
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i; done
|
||||
|
||||
clean:
|
||||
-rm -f $(MODS)
|
||||
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i clean; done
|
||||
|
||||
distclean: clean
|
||||
-rm -f $(PROGS) .depend config.h config.status config.cache \
|
||||
config.log Makefile confdefs.h policy.h
|
||||
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i distclean; done
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i distclean; done
|
||||
|
||||
ifeq (.depend,$(wildcard .depend))
|
||||
include .depend
|
||||
|
|
|
|||
16
lib/Makefile
16
lib/Makefile
|
|
@ -61,29 +61,29 @@ DEFS += -I$(PREFIXDIR)
|
|||
all: libs libisdn.a
|
||||
|
||||
libs:
|
||||
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i; done
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i; done
|
||||
|
||||
depend dep: .depend
|
||||
|
||||
.depend:
|
||||
$(CPP) -M $(CFLAGS) $(DEFS) *.c >.depend
|
||||
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i depend; done
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i depend; done
|
||||
|
||||
clean:
|
||||
-rm -f *.o *.a
|
||||
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i clean; done
|
||||
|
||||
distclean: clean
|
||||
-rm -f .depend policy.h
|
||||
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i distclean; done
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i distclean; done
|
||||
|
||||
install: depend all
|
||||
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i depend; done
|
||||
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i all; done
|
||||
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i install; done
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i depend; done
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i all; done
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done
|
||||
|
||||
deinstall: distclean
|
||||
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i deinstall; done
|
||||
set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i deinstall; done
|
||||
|
||||
|
||||
libisdn.a: conffile.o isdntools.o libtools.o $(LIB_AREA)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# $Id: config.in,v 1.15 1997/03/29 15:05:34 fritz Exp $
|
||||
# $Id: config.in,v 1.16 1997/04/03 08:57:07 fritz Exp $
|
||||
#
|
||||
# The whole configuration stuff is borrowed from the kernel
|
||||
# configuration.
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
# For a description of the syntax of this configuration file,
|
||||
# see the Menuconfig script.
|
||||
#
|
||||
CONFIG_HASX11=n
|
||||
if [ "`type -p xmkmf`" != "" ]; then
|
||||
CONFIG_HASX11=y
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: Makefile.in,v 1.3 1997/03/03 04:01:00 fritz Exp $
|
||||
# $Id: Makefile.in,v 1.4 1997/04/03 08:57:11 fritz Exp $
|
||||
#
|
||||
# Makefile for telesctrl
|
||||
# (C) 1997 Fritz Elfert
|
||||
|
|
@ -68,10 +68,10 @@ install-strip: $(PROGRAMS) $(MANPAGES)
|
|||
$(INSTALL_MAN) $(MANPAGES) $(MAN8DIR)
|
||||
|
||||
uninstall:
|
||||
@for i in $(PROGRAMS) ; do \
|
||||
@for i in `echo $(PROGRAMS)` ; do \
|
||||
rm -f $(SBINDIR)/$$i ; \
|
||||
done
|
||||
@for i in $(MANPAGES) ; do \
|
||||
@for i in `echo $(MANPAGES)` ; do \
|
||||
rm -f $(MAN8DIR)/$$i ; \
|
||||
done
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# $Id: Makefile.in,v 1.9 1997/03/18 12:36:26 michael Exp $
|
||||
# $Id: Makefile.in,v 1.10 1997/04/03 08:57:15 fritz Exp $
|
||||
|
||||
#----------------------------------------------------------------------------#
|
||||
# Things you can change to personalize the Makefile for your own site. Some #
|
||||
|
|
@ -195,7 +195,7 @@ ifeq ($(ACTION_ON_VBOX),y)
|
|||
@$(INSTALL_BIN) $(TOPDIR)/src/vbox $(bindir)
|
||||
endif
|
||||
|
||||
@set -e; for i in $(CATALOGS); do \
|
||||
@set -e; for i in `echo $(CATALOGS)`; do \
|
||||
$(ECHO) "Installing '$(LOCALEDIR)/$$i/LC_MESSAGES/$(PACKAGE).mo'..."; \
|
||||
$(INSTALL_LOCALE) $(TOPDIR)/messages/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(PACKAGE).mo; \
|
||||
done
|
||||
|
|
@ -215,7 +215,7 @@ MAKETHISDIRS = $(prefix) $(exec_prefix) $(sbindir) $(bindir) \
|
|||
$(LCKFILEDIR)
|
||||
|
||||
install-dirs: ignore
|
||||
@set -e; for i in $(MAKETHISDIRS); do \
|
||||
@set -e; for i in `echo $(MAKETHISDIRS)`; do \
|
||||
$(ECHO) -n "Checking '$$i'... "; \
|
||||
if [ -d $$i ]; then \
|
||||
$(ECHO) "it's here."; \
|
||||
|
|
@ -224,7 +224,7 @@ install-dirs: ignore
|
|||
$(INSTALL_DIRS) $$i; \
|
||||
fi; \
|
||||
done
|
||||
@set -e; for i in $(CATALOGS); do \
|
||||
@set -e; for i in `echo $(CATALOGS)`; do \
|
||||
$(ECHO) -n "Checking '$(LOCALEDIR)/$$i/LC_MESSAGES'... "; \
|
||||
if [ -d $(LOCALEDIR)/$$i/LC_MESSAGES ]; then \
|
||||
$(ECHO) "it's here."; \
|
||||
|
|
|
|||
Loading…
Reference in New Issue