From cc87eac5c0e4025fba81abe8433315df84489c56 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Thu, 27 Nov 2014 22:48:46 +0100 Subject: [PATCH] Fixed building in different build directory, as described in INSTALL. --- INSTALL | 6 ++++-- man/Makefile.in | 2 +- sbr/Makefile.in | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index cde8cc3..fa2713c 100644 --- a/INSTALL +++ b/INSTALL @@ -103,8 +103,10 @@ to the directory where you want the object files and executables to go and run the "configure" script. "configure" automatically checks for the source code in the directory that "configure" is in. For example, - cd /usr/local/solaris/mmh - /usr/local/src/mmh-0.1/configure + cd /usr/local/src/mmh # source directory + make clean + cd /usr/local/solaris/mmh # build directory + /usr/local/src/mmh/configure make --------------------- diff --git a/man/Makefile.in b/man/Makefile.in index 9e01e93..2246c17 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -78,7 +78,7 @@ AUX = Makefile.in mh-chart-gen.sh # all files in this directory included in the distribution DIST = $(DIST_MAN1) $(DIST_MAN5) $(DIST_MAN7) $(DIST_MAN8) $(AUX) -ALLPROGS = $(DIST_MAN1) $(DIST_MAN8) +ALLPROGS = $(MAN1) $(MAN8) # ========= DEFAULT TARGET ========== diff --git a/sbr/Makefile.in b/sbr/Makefile.in index 6bda370..9539c0f 100644 --- a/sbr/Makefile.in +++ b/sbr/Makefile.in @@ -17,7 +17,8 @@ etcdir = @sysconfdir@ CC = @CC@ CFLAGS = @CFLAGS@ DEFS = @DEFS@ -INCLUDES = -I$(top_srcdir) @CPPFLAGS@ +# add include dir . for sigmsg.h when building in different directory +INCLUDES = -I$(top_srcdir) -I. @CPPFLAGS@ LEX = @LEX@ AWK = @AWK@ @@ -93,7 +94,7 @@ lint: sigmsg.h # Also, not all makes accept $< in non-pattern rules, # hence the explicit filenames here. dtimep.c: dtimep.lex - $(LEX) -n -t $(srcdir)/dtimep.lex > dtimep.c + $(LEX) -n -t $(srcdir)/dtimep.lex > $@ pidstatus.o: sigmsg.h -- 1.7.10.4