Eximon: fix string-handling. Bug 2500

[exim.git] / src / OS / Makefile-Base

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 1ab3ac35f36388a339ded06b53b2053612c4d950..7122bc019f374e2e4af67044d18c98409eded203 100644 (file)
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -644,8 +644,7 @@ HDRS  =     blob.h \
        mytypes.h \
        sha_ver.h \
        structs.h \
-       os.h \
-       osfunctions.h
+       os.h
 PHDRS = ../config.h \
        ../dbfunctions.h \
        ../dbstuff.h \
@@ -656,8 +655,7 @@ PHDRS = ../config.h \
        ../macros.h \
        ../mytypes.h \
        ../structs.h \
-       ../os.h \
-       ../osfunctions.h
+       ../os.h
 
 .SUFFIXES: .o .c
 .c.o:;  @echo "$(CC) $*.c"
@@ -872,9 +870,9 @@ em_text.o:       ../exim_monitor/em_text.c    ../exim_monitor/em_hdr.h
 em_xs.o:         ../exim_monitor/em_xs.c      ../exim_monitor/em_hdr.h
 em_version.o:    ../exim_monitor/em_version.c ../exim_monitor/em_hdr.h
 $(MONBIN): $(HDRS)
-                @echo "$(CC) exim_monitor/`echo $@ | sed 's/o$$/c/'`"
-                $(FE)$(CC) -o $@ -c $(CFLAGS) -I. -I../exim_monitor $(INCLUDE) $(XINCLUDE) \
-                  ../exim_monitor/`echo $@ | sed 's/o$$/c/'`
+                @echo "$(CC) exim_monitor/$(@:.o=.c)"
+                $(FE)$(CC) -o $@ -c $(CFLAGS) -DCOMPILE_UTILITY -I. -I../exim_monitor $(INCLUDE) $(XINCLUDE) \
+                  ../exim_monitor/$(@:.o=.c)
 
 
 # Targets for the various libraries that Exim uses.