mksignal stuff now works

history stuff maybe works

1 files changed, 8 insertions, 12 deletions

diff --git a/Makefile.am b/Makefile.am
index 8515ce0..672ce3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,10 @@
 ## Process this file with automake to produce Makefile.in
 
 if HISTORY
-HISTBIN = history
-HISTMAN = history.1
+man_MANS = rc.1 history.1
+HIST = history
 else
-HISTBIN =
-HISTMAN =
+man_MANS = rc.1
 endif
 
 if H_R_S
@@ -23,7 +22,7 @@ RLO = readline.o
 endif
 
 bin_PROGRAMS = rc
-noinst_PROGRAMS = mksignal $(HISTBIN)
+noinst_PROGRAMS = mksignal $(HIST)
 
 rc_SOURCES = @ADDON@ builtins.c except.c exec.c fn.c footobar.c getopt.c glob.c glom.c hash.c heredoc.c input.c lex.c list.c main.c match.c nalloc.c open.c print.c redir.c sigmsgs.c signal.c status.c tree.c utils.c var.c wait.c walk.c which.c y.tab.c
 
@@ -32,20 +31,17 @@ EXTRA_rc_SOURCES = execve.c readline.c system.c system-bsd.c
 rc_DEPENDENCIES = $(SYSTEM) $(EXECVE) $(RLO)
 rc_LDADD = $(SYSTEM) $(EXECVE) $(RLO)
 
-history_SOURCES = history.c
-
 mksignal_SOURCES = mksignal.c
 
 noinst_HEADERS = group.h jbwrap.h proto.h rc.h rlimit.h y.tab.h
 
 BUILT_SOURCES = sigmsgs.c y.tab.c
 
-man_MANS = rc.1 $(HISTMAN)
 
-EXTRA_DIST = addon.c addon.h EXAMPLES history.1 mksignal parse.y rc.1 trip.rc
+EXTRA_DIST = addon.c addon.h EXAMPLES history.1 parse.y rc.1 trip.rc
 
-sigmsgs.c sigmsgs.h: $(srcdir)/mksignal
-	$(srcdir)/mksignal
+sigmsgs.c sigmsgs.h: ./mksignal
+	./mksignal
 
 y.tab.c: $(srcdir)/parse.y
 	$(YACC) -d $(srcdir)/parse.y
@@ -55,7 +51,7 @@ trip: rc
 
 install-exec-hook:
 if HISTORY
-	$(LN) $(HISTBIN) - ;\
+	$(LN) history - ;\
 	$(INSTALL_PROGRAM) - $(bindir) ;\
 	rm -f $(bindir)/--;  $(LN) $(bindir)/- $(bindir)/-- ;\
 	rm -f $(bindir)/-p;  $(LN) $(bindir)/- $(bindir)/-p ;\