X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=doc_inner%2FMakefile;h=871aea5c3f37e017d48bb2e7f0d845bcd501137c;hb=1b50560326f7ce2b73848537b20d48a961195a0f;hp=ac2414a3f7710f1977190ccb93ce53eab22d9c83;hpb=87f036b3d45181aa7a0905c2c003416786c84ea8;p=YACASL2.git

diff --git a/doc_inner/Makefile b/doc_inner/Makefile
index ac2414a..871aea5 100644
--- a/doc_inner/Makefile
+++ b/doc_inner/Makefile
@@ -1,13 +1,13 @@
-.PHONY: all clean clean_doxygen clean_gnu_global
-CD ?= cd
-MV ?= mv
-MAKE ?= make
-DOXYGEN ?= doxygen
-HTAGS ?= htags
-RMRF ?= rm -rf
-PWD ?= pwd
-WHICH ?= which
-ECHO ?= echo
+.PHONY: all clean doxygen-clean gnu_global-clean
+
+CD := cd
+DOXYGEN := doxygen
+ECHO := echo
+HTAGS := htags
+MAKE := make
+MV := mv
+RMRF := rm -rf
+WHICH := which
 
 DOXYGEN_DIR := doxygen
 GNU_GLOBAL_DIR := gnu_global
@@ -18,18 +18,18 @@ all: $(DOXYGEN_DIR) $(GNU_GLOBAL_DIR)
 # ../Doxyfileで設定された以下のディレクトリーの下のhtmlディレクトリー
 #   OUTPUT_DIRECTORY = doc_inner
 $(DOXYGEN_DIR): ../Doxyfile
-	$(WHICH) $(DOXYGEN) && ($(CD) .. && $(DOXYGEN) && $(CD) - && $(MV) html $@) >/dev/null || $(ECHO) "$(DOXYGEN): not found"
+	$(if $(strip $(shell $(WHICH) $(DOXYGEN))),$(CD) .. && $(DOXYGEN) && $(MV) $(CURDIR)/html $(CURDIR)/$@,$(ECHO) '$(DOXYGEN): not found')
 
 # htagsのHTMLドキュメント作成先は、
 # 引数DIRで指定されたディレクトリーの下のHTMLディレクトリー
 $(GNU_GLOBAL_DIR):
 	$(MAKE) -C .. gtags
-	$(WHICH) $(HTAGS) && ($(CD) .. && $(HTAGS) -anosx doc_inner && $(CD) - && $(MV) HTML $@)  >/dev/null || $(ECHO) "$(HTAGS): not found"
+	$(if $(strip $(shell $(WHICH) $(HTAGS))),$(CD) .. && $(HTAGS) -anosx $(CURDIR) && $(MV) $(CURDIR)/HTML $(CURDIR)/$@,@$(ECHO) '$(HTAGS): not found')
 
-clean: clean_doxygen clean_gnu_global
+clean: doxygen-clean gnu_global-clean
 
-clean_doxygen:
+doxygen-clean:
 	@$(RMRF) $(DOXYGEN_DIR)
 
-clean_gnu_global:
+gnu_global-clean:
 	@$(RMRF) $(GNU_GLOBAL_DIR)