slocal: use mhetcdir instead of NMHETCDIR.

[mmh] / uip / Makefile.in

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 02bc94e..d81985f 100644 (file)
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -17,7 +17,6 @@ etcdir      = @sysconfdir@
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
-CONFIGDEFS = -DNMHETCDIR='"$(etcdir)"'
 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
 LDFLAGS  = @LDFLAGS@
 
@@ -32,7 +31,6 @@ TERMLIB = @TERMLIB@
 LEXLIB  = @LEXLIB@
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
-COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
 LINK    = $(CC) $(LDFLAGS) -o $@
 LN = ln
 
@@ -125,8 +123,8 @@ folder: folder.o $(LOCALLIBS)
 forw: forw.o whatnowproc.o annosbr.o $(LOCALLIBS)
        $(LINK) forw.o whatnowproc.o annosbr.o $(LINKLIBS)
 
-inc: inc.o scansbr.o dropsbr.o termsbr.o $(LOCALLIBS)
-       $(LINK) inc.o scansbr.o dropsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
+inc: inc.o scansbr.o termsbr.o $(LOCALLIBS)
+       $(LINK) inc.o scansbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
 mmh: mmh.sh
        cp mmh.sh mmh
@@ -215,11 +213,8 @@ sendfiles: sendfiles.sh
 show: show.o $(LOCALLIBS)
        $(LINK) show.o $(LINKLIBS)
 
-slocal.o: slocal.c
-       $(COMPILE2) $(srcdir)/slocal.c
-
-slocal: slocal.o aliasbr.o dropsbr.o $(LOCALLIBS)
-       $(LINK) slocal.o aliasbr.o dropsbr.o $(LINKLIBS)
+slocal: slocal.o $(LOCALLIBS)
+       $(LINK) slocal.o $(LINKLIBS)
 
 sortm: sortm.o $(LOCALLIBS)
        $(LINK) sortm.o $(LINKLIBS)
@@ -237,7 +232,7 @@ install: install-cmds install-misc install-lcmds install-scmds
 
 # install commands
 install-cmds:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+       mkdir -p $(DESTDIR)$(bindir)
        for cmd in $(CMDS); do \
          $(INSTALL_PROGRAM) $$cmd $(DESTDIR)$(bindir)/$$cmd; \
        done
@@ -261,7 +256,7 @@ install-lcmds:
 
 # install misc support binaries
 install-misc:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
+       mkdir -p $(DESTDIR)$(libdir)
        for misc in $(MISC); do \
          $(INSTALL_PROGRAM) $$misc $(DESTDIR)$(libdir)/$$misc; \
        done
@@ -316,7 +311,7 @@ Makefile: Makefile.in ../config.status
        cd .. && ./config.status $(subdir)/$@
 
 distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
+mmhdist: $(DIST)
        @echo "Copying distribution files in $(subdir)"
        @for file in $(DIST); do \
          cp -p $(srcdir)/$$file $(distdir); \