Remove .cvsignore files on all active branches.

[sgt/halibut] / Makefile

diff --git a/Makefile b/Makefile
index fd6f932..94433c8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,15 +42,15 @@ endif
 
 all install:
        @test -d $(BUILDDIR) || mkdir $(BUILDDIR)
-       @make -C $(BUILDDIR) -f ../Makefile $@ REALBUILD=yes
+       @$(MAKE) -C $(BUILDDIR) -f ../Makefile $@ REALBUILD=yes
 
 spotless: topclean
        @test -d $(BUILDDIR) || mkdir $(BUILDDIR)
-       @make -C $(BUILDDIR) -f ../Makefile spotless REALBUILD=yes
+       @$(MAKE) -C $(BUILDDIR) -f ../Makefile spotless REALBUILD=yes
 
 clean: topclean
        @test -d $(BUILDDIR) || mkdir $(BUILDDIR)
-       @make -C $(BUILDDIR) -f ../Makefile clean REALBUILD=yes
+       @$(MAKE) -C $(BUILDDIR) -f ../Makefile clean REALBUILD=yes
 
 # Remove Halibut output files in the source directory (may
 # have been created by running, for example, `build/halibut
@@ -76,7 +76,7 @@ release:
            ) > reltmp/$(RELDIR)/manifest;                              \
            echo "-DVERSION=\"$(VERSION)\"" > reltmp/$(RELDIR)/version; \
        fi
-       tar chzvCf reltmp - $(RELDIR) > $(RELDIR).tar.gz
+       tar chzvoCf reltmp $(RELDIR).tar.gz $(RELDIR)
        rm -rf reltmp
 
 else
@@ -115,7 +115,7 @@ include $(LIBCHARSET_SRCDIR)Makefile
 
 MODULES := main malloc ustring error help licence version misc tree234
 MODULES += input keywords contents index style biblio
-MODULES += bk_text bk_xhtml bk_whlp bk_man bk_info bk_paper bk_ps bk_pdf
+MODULES += bk_text bk_html bk_whlp bk_man bk_info bk_paper bk_ps bk_pdf
 MODULES += winhelp psdata wcwidth
 
 OBJECTS := $(addsuffix .o,$(MODULES)) $(LIBCHARSET_OBJS)