X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2FMakefile.in;h=d7cad062e1ccb5817b9bbc18d857014fd1294292;hp=bf23531685d34d9eceb0ab795551199150c715b8;hb=88b2142594d5ea1e8385dae5eca81eed1018c555;hpb=58cf09aa36e9f7f352a127158bbf1c5678bc6ed8

diff --git a/uip/Makefile.in b/uip/Makefile.in
index bf23531..d7cad06 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -17,11 +17,12 @@ etcdir      = @sysconfdir@
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
-INCLUDES = -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
+# add include dir .. for config.h when building in different directory
+INCLUDES = -I$(srcdir) -I$(top_srcdir) -I.. @CPPFLAGS@
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@
-LOCALLIBS = ../config/version.o ../config/config.o ../sbr/libmh.a
+LOCALLIBS = ../sbr/libmh.a
 LINKLIBS = $(LOCALLIBS) $(LIBS)
 
 LINT    = @LINT@
@@ -57,7 +58,7 @@ CMDS = ali anno burst comp dist flist folder forw mmh mark \
 LCMDS = flists folders next prev fnext fprev unseen
 
 # misc support binaries
-MISC = ap dp fmtdump mhtest mmhwrap
+MISC = ap dp fmtdump mhtest mmhwrap whatnow2
 
 # commands with 'S'pecial installation needs
 SCMDS = inc
@@ -73,13 +74,7 @@ SRCS = ali.c aliasbr.c anno.c ap.c burst.c comp.c \
 	prompter.c rcvdist.c rcvpack.c rcvstore.c \
 	refile.c repl.c rmf.c rmm.c scan.c scansbr.c send.c \
 	sendfiles.sh slocal.c sortm.c spost.c termsbr.c \
-	whatnow.c whatnowproc.c whom.c
-
-# auxiliary files
-AUX = Makefile.in
-
-# all files in this directory included in the distribution
-DIST = $(SRCS) $(AUX)
+	whatnow.c whatnowproc.c whom.c whatnow2.sh
 
 # ========== DEFAULT TARGET ==========
 
@@ -135,7 +130,7 @@ mmhwrap: mmhwrap.sh
 	chmod +x mmhwrap
 
 mhsign: mhsign.sh
-	cp $(srcdir)/mhsign.sh mhsign
+	sed "s,%libdir%,"$(libdir)"," $(srcdir)/mhsign.sh >mhsign
 	chmod +x mhsign
 
 mhpgp: mhpgp.sh
@@ -228,6 +223,9 @@ spost: spost.o aliasbr.o $(LOCALLIBS)
 whatnow: whatnow.o $(LOCALLIBS)
 	$(LINK) whatnow.o $(LINKLIBS)
 
+whatnow2: whatnow2.sh
+	cp $(srcdir)/whatnow2.sh whatnow2
+
 whom: whom.o $(LOCALLIBS)
 	$(LINK) whom.o $(LINKLIBS)
 
@@ -316,10 +314,3 @@ subdir = uip
 Makefile: Makefile.in ../config.status
 	cd .. && ./config.status $(subdir)/$@
 
-distdir = ../`cat ../distname`/$(subdir)
-mmhdist: $(DIST)
-	@echo "Copying distribution files in $(subdir)"
-	@for file in $(DIST); do \
-	  cp -p $(srcdir)/$$file $(distdir); \
-	done
-