--- makefile.orig 1998-06-22 20:43:44.000000000 +0800 +++ makefile 2014-06-11 22:55:36.258776918 +0800 @@ -9,7 +9,7 @@ INSTALL_LIBDIR=/usr/local/lib INSTALL_BINDIR=/usr/local/bin INSTALL_INCDIR=/usr/local/include INSTALL_SIODDIR=/usr/local/lib/siod -INSTALL_PERLDIR=/usr/local/lib/perl5/site_perl +INSTALL_PERLDIR=$(SITE_PERL) INSTALL_DEMODIR=$$HOME/public_html/chtml #CFLAGS=-g -Wall @@ -17,7 +17,7 @@ INSTALL_DEMODIR=$$HOME/public_html/chtml .SUFFIXES: .html .html-bin .smd .cgi .pl .cgi .scm .cgi .html.html-bin: - chtml $< :o=$@ + ./chtml $< :o=$@ .pl.cgi: echo "#!`which perl`" > $@ @@ -101,24 +101,24 @@ test: all ./chtmlt install: all - -mkdir $(INSTALL_MANDIR) - -mkdir $(INSTALL_LIBDIR) - -mkdir $(INSTALL_BINDIR) - -mkdir $(INSTALL_INCDIR) - -mkdir $(INSTALL_SIODDIR) - -mkdir $(INSTALL_PERLDIR) - cp -f chtml.1 $(INSTALL_MANDIR) - cp -f libchtml.a $(INSTALL_LIBDIR) - cp -f chtml $(INSTALL_BINDIR) - cp -f chtml.h $(INSTALL_INCDIR) - cp -f chtml.scm $(INSTALL_SIODDIR) - cp -f chtml-cmp.c-bin $(INSTALL_SIODDIR) - cp -f chtml.pl $(INSTALL_PERLDIR) + -mkdir $(DESTDIR)$(INSTALL_MANDIR) + -mkdir $(DESTDIR)$(INSTALL_LIBDIR) + -mkdir $(DESTDIR)$(INSTALL_BINDIR) + -mkdir $(DESTDIR)$(INSTALL_INCDIR) + -mkdir $(DESTDIR)$(INSTALL_SIODDIR) + -mkdir -p $(DESTDIR)$(INSTALL_PERLDIR) + cp -f chtml.1 $(DESTDIR)$(INSTALL_MANDIR) + cp -f libchtml.a $(DESTDIR)$(INSTALL_LIBDIR) + cp -f chtml $(DESTDIR)$(INSTALL_BINDIR) + cp -f chtml.h $(DESTDIR)$(INSTALL_INCDIR) + cp -f chtml.scm $(DESTDIR)$(INSTALL_SIODDIR) + cp -f chtml-cmp.c-bin $(DESTDIR)$(INSTALL_SIODDIR) + cp -f chtml.pl $(DESTDIR)$(INSTALL_PERLDIR) install-demo: all chtml.tgz - -mkdir $(INSTALL_DEMODIR) - cp -f *.cgi *.html *.html-bin $(INSTALL_DEMODIR) - cp -f *.c *.scm *.smd *.pl $(INSTALL_DEMODIR) + -mkdir $(DESTDIR)$(INSTALL_DEMODIR) + cp -f *.cgi *.html *.html-bin $(DESTDIR)$(INSTALL_DEMODIR) + cp -f *.c *.scm *.smd *.pl $(DESTDIR)$(INSTALL_DEMODIR) chtml.tgz: $(INPLACE_FILES) $(SOURCE_FILES) test.txt @@ -191,7 +191,7 @@ pure_tests: pure_chtmlt.err pure_next.er pure_chtmlt.err: pure_chtmlt - pure_chtmlt 2> pure_chtmlt.err + ./pure_chtmlt 2> pure_chtmlt.err pure_next.err: pure_next.cgi (PATH_INFO=/homes.html-bin; export PATH_INFO; pure_next.cgi 2> pure_next.err) @@ -201,31 +201,31 @@ wc.txt: chtml.scm chtml-cmp.scm chtml-cmp.c-bin: chtml-cmp.c - chtml chtml-cmp.c :o=chtml-cmp.c-bin + ./chtml chtml-cmp.c :o=chtml-cmp.c-bin idiom_test: all link.html-bin-bin link_html-bin-bin.c link_html-bin-bin.scm - chtmlt link.html-bin-bin + ./chtmlt link.html-bin-bin link.html-bin-bin: link.html-bin link1.html-bin link2.html-bin - chtml -v03 :action=link link.html-bin link1.html-bin link2.html-bin + ./chtml -v03 :action=link link.html-bin link1.html-bin link2.html-bin link_html-bin-bin.c: link.html-bin link1.html-bin link2.html-bin - chtml -v03 :action=link link.html-bin link1.html-bin link2.html-bin \ + ./chtml -v03 :action=link link.html-bin link1.html-bin link2.html-bin \ :o=link_html-bin-bin.c :p=c link_html-bin-bin.scm: link.html-bin link1.html-bin link2.html-bin - chtml -v03 :action=link link.html-bin link1.html-bin link2.html-bin \ + ./chtml -v03 :action=link link.html-bin link1.html-bin link2.html-bin \ :o=link_html-bin-bin.scm :p=read link.html-bin: link.html - chtml -v02 link.html + ./chtml -v02 link.html link1.html-bin: link1.html - chtml -v02 link1.html + ./chtml -v02 link1.html link2.html-bin: link2.html - chtml -v02 link2.html + ./chtml -v02 link2.html # these targets are is of local use only.