From ebfb606b51658926a106bc30a5ee496cad711139 Mon Sep 17 00:00:00 2001 From: Daniel Carl Date: Mon, 29 Jul 2013 16:00:03 +0200 Subject: [PATCH] Removed vimb.1.txt to process manpage direct for install target. --- .gitignore | 1 - Makefile | 6 +----- doc/Makefile | 21 +++++---------------- doc/{vimb.1.txt => vimb.1} | 0 4 files changed, 6 insertions(+), 22 deletions(-) rename doc/{vimb.1.txt => vimb.1} (100%) diff --git a/.gitignore b/.gitignore index e92aab6..32d4c57 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,5 @@ vimb vimb_dbg *.tar.gz -doc/*.1 src/hints.js.h src/config.h diff --git a/Makefile b/Makefile index 2f2192f..dea0043 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ include config.mk -include $(DEPS) -all: $(TARGET) man +all: $(TARGET) options: @echo "$(PROJECT) build options:" @@ -41,9 +41,6 @@ $(DTARGET): $(DOBJ) @echo "${CC} $<" @$(CC) -c -o $@ $< $(CPPFLAGS) $(DFLAGS) -man: - @$(MAKE) $(MFLAGS) -C doc man - install: $(TARGET) install -d $(DESTDIR)$(BINDIR) install -m 755 $(TARGET) $(DESTDIR)$(BINDIR)/$(TARGET) @@ -54,7 +51,6 @@ uninstall: @$(MAKE) $(MFLAGS) -C doc uninstall clean: - @$(MAKE) $(MFLAGS) -C doc clean $(RM) src/*.o src/*.do src/hints.js.h $(TARGET) $(DTARGET) dist: distclean diff --git a/doc/Makefile b/doc/Makefile index e7e57fb..cc16ee6 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -3,24 +3,13 @@ include ../config.mk MANDIR1 = $(MANDIR)/man1 MAN1 = $(PROJECT).1 -all: man - -man: $(MAN1) - -%.1: %.1.txt - @echo build manual page +install: $(MAN1) + install -d $(DESTDIR)$(MANDIR1) + @echo "install -m 644 $(MAN1) $(DESTDIR)$(MANDIR1)/$(MAN1)" @sed -e "s/VERSION/$(VERSION)/g" \ -e "s/DATE/`date +'%m %Y'`/g" \ - -e "s/PROJECT/$(PROJECT)/g" < $< > $@ - -install: man - install -d $(DESTDIR)$(MANDIR1) - install -m 644 $(MAN1) $(DESTDIR)$(MANDIR1)/$(MAN1) + -e "s/PROJECT/$(PROJECT)/g" < $(MAN1) > $(DESTDIR)$(MANDIR1)/$(MAN1) + @chmod 644 $(DESTDIR)$(MANDIR1)/$(MAN1) uninstall: $(RM) $(DESTDIR)$(MANDIR1)/$(MAN1) - -clean: - $(RM) *.1 - -.PHONY: clean diff --git a/doc/vimb.1.txt b/doc/vimb.1 similarity index 100% rename from doc/vimb.1.txt rename to doc/vimb.1 -- 2.20.1