| Revisão | 500dcf25714e1c0265cf79f8e49b6b6785eb2bb0 (tree) |
|---|---|
| Hora | 2019-06-12 16:31:35 |
| Autor | NARUSE, Yui <nurse@user...> |
| Commiter | GitHub |
Merge pull request #7 from conao3/fix-mkdir-option
Add -p option for mkdir to suppress error.
| @@ -6,7 +6,7 @@ SHAR = shar | ||
| 6 | 6 | PERL = perl |
| 7 | 7 | RM = rm -rf |
| 8 | 8 | VERSION = 2.1.5 |
| 9 | -MKDIR = mkdir | |
| 9 | +MKDIR = $(shell if pwd | xargs mkdir 2>/dev/null -p ; then echo "mkdir -p"; else echo "mkdir"; fi) | |
| 10 | 10 | prefix = /usr/local |
| 11 | 11 | PYTHON2 = python |
| 12 | 12 | PYTHON3 = python |
| @@ -60,8 +60,8 @@ install-man-ja: | ||
| 60 | 60 | cp -f nkf.1j $(prefix)/man/ja/man1/nkf.1 |
| 61 | 61 | |
| 62 | 62 | shar: |
| 63 | - -mkdir nkf-$(VERSION) | |
| 64 | - -mkdir nkf-$(VERSION)/NKF.mod | |
| 63 | + -$(MKDIR) nkf-$(VERSION) | |
| 64 | + -$(MKDIR) nkf-$(VERSION)/NKF.mod | |
| 65 | 65 | for file in `cat MANIFEST`; \ |
| 66 | 66 | do \ |
| 67 | 67 | nkf -j -m0 $$file > nkf-$(VERSION)/$$file ; \ |
| @@ -74,11 +74,11 @@ shar: | ||
| 74 | 74 | -$(RM) nkf-$(VERSION) |
| 75 | 75 | |
| 76 | 76 | tar: |
| 77 | - -mkdir nkf-$(VERSION) | |
| 78 | - -mkdir nkf-$(VERSION)/NKF.mod | |
| 79 | - -mkdir nkf-$(VERSION)/NKF.python2 | |
| 80 | - -mkdir nkf-$(VERSION)/NKF.python3 | |
| 81 | - -mkdir nkf-$(VERSION)/man | |
| 77 | + -$(MKDIR) nkf-$(VERSION) | |
| 78 | + -$(MKDIR) nkf-$(VERSION)/NKF.mod | |
| 79 | + -$(MKDIR) nkf-$(VERSION)/NKF.python2 | |
| 80 | + -$(MKDIR) nkf-$(VERSION)/NKF.python3 | |
| 81 | + -$(MKDIR) nkf-$(VERSION)/man | |
| 82 | 82 | for file in `cat MANIFEST`; \ |
| 83 | 83 | do \ |
| 84 | 84 | cp $$file nkf-$(VERSION)/$$file ; \ |
Fork
Makefile