String expansions: fix ${extract }, for the numeric/3-string case. Bug 1807

[users/jgh/exim.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 4c8300ca7a4327ba3ddd9864e0a22de975b258a1..adda7ceb3359d6f8bb27d9879c99e9275dff0895 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,7 +2,7 @@
 # appropriate links, and then creating and running the main makefile in that
 # directory.
 
 # appropriate links, and then creating and running the main makefile in that
 # directory.
 

-# Copyright (c) University of Cambridge, 1995 - 2007
+# Copyright (c) University of Cambridge, 1995 - 2015

 # See the file NOTICE for conditions of use and distribution.
 
 # IRIX make uses the shell that is in the SHELL variable, which often defaults
 # See the file NOTICE for conditions of use and distribution.
 
 # IRIX make uses the shell that is in the SHELL variable, which often defaults


@@ -28,6 +28,14 @@ buildname=$${build:-`$(SHELL) scripts/os-type`-`$(SHELL) scripts/arch-type`}
 all: Local/Makefile configure
        @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS)
 
 all: Local/Makefile configure
        @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS)
 

+
+# This pair for the convinience of of the Debian maintainers
+exim: Local/Makefile configure
+       @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS) exim
+utils: Local/Makefile configure
+       @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS) utils
+
+

 Local/Makefile:
        @echo ""
        @echo "*** Please create Local/Makefile by copying src/EDITME and making"
 Local/Makefile:
        @echo ""
        @echo "*** Please create Local/Makefile by copying src/EDITME and making"


@@ -45,23 +53,24 @@ build-directory:
        $(SHELL) -c "test -d $$builddir -a -r $$builddir/version.c || \
          (mkdir $$builddir; cd $$builddir; $(SHELL) ../scripts/MakeLinks)";
 
        $(SHELL) -c "test -d $$builddir -a -r $$builddir/version.c || \
          (mkdir $$builddir; cd $$builddir; $(SHELL) ../scripts/MakeLinks)";
 

+checks:
+       $(SHELL) scripts/source_checks
+

 # The "configure" target ensures that the build directory exists, then arranges
 # to build the main makefile from inside the build directory, by calling the
 # Configure-Makefile script. This does its own dependency checking because of
 # the optional files.
 
 # The "configure" target ensures that the build directory exists, then arranges
 # to build the main makefile from inside the build directory, by calling the
 # Configure-Makefile script. This does its own dependency checking because of
 # the optional files.
 

-configure: build-directory
+configure: checks build-directory

        @cd build-$(buildname); \
        @cd build-$(buildname); \

-         build=$(build) $(SHELL) ../scripts/Configure-Makefile; \
-         $(SHELL) ../scripts/lookups-Makefile
+         build=$(build) $(SHELL) ../scripts/Configure-Makefile

 
 # The "makefile" target forces a rebuild of the makefile (as opposed to
 # "configure", which doesn't force it).
 
 makefile: build-directory
        @cd build-$(buildname); $(RM_COMMAND) -f Makefile; \
 
 # The "makefile" target forces a rebuild of the makefile (as opposed to
 # "configure", which doesn't force it).
 
 makefile: build-directory
        @cd build-$(buildname); $(RM_COMMAND) -f Makefile; \

-         build=$(build) $(SHELL) ../scripts/Configure-Makefile; \
-         $(SHELL) ../scripts/lookups-Makefile
+         build=$(build) $(SHELL) ../scripts/Configure-Makefile

 
 # The installation commands are kept in a separate script, which expects
 # to be run from inside the build directory.
 
 # The installation commands are kept in a separate script, which expects
 # to be run from inside the build directory.


@@ -84,6 +93,18 @@ clean_exim:; cd build-$(buildname); \
         $(RM_COMMAND) -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
        routers/*.o routers/*.a transports/*.o transports/*.a lookups/*.so
 
         $(RM_COMMAND) -f *.o lookups/*.o lookups/*.a auths/*.o auths/*.a \
        routers/*.o routers/*.a transports/*.o transports/*.a lookups/*.so
 

-distclean:; $(RM_COMMAND) -rf build-*
+distclean:; $(RM_COMMAND) -rf build-* cscope*
+
+cscope.files: FRC
+       echo "-q" > $@
+       echo "-p3" >> $@
+       find src Local OS exim_monitor -name "*.[cshyl]" -print \
+                   -o -name "os.h*" -print \
+                   -o -name "*akefile*" -print \
+                   -o -name config.h.defaults -print \
+                   -o -name EDITME -print >> $@
+       ls OS/* >> $@
+
+FRC:

 
 # End of top-level makefile
 
 # End of top-level makefile