• R/O
  • HTTP
  • SSH
  • HTTPS

nkf: Commit

nkfのGitリポジトリです。


Commit MetaInfo

Revision9ccff5975bec7963e591e042e1ab1139252a4dc9 (tree)
Time2019-06-09 01:52:05
Authorconao3 <conao3@gmai...>
Commiterconao3

Log Message

Add -p option for mkdir to suppress error.

Compiling nkf in Docker, error occur and ignored by make.
https://github.com/conao3/docker-nkf


Step 6/13 : RUN git clone https://github.com/nurse/nkf.git

---> Using cache
---> 1f18636e4d38

Step 7/13 : WORKDIR nkf

---> Using cache
---> e0210ecbf6aa

Step 8/13 : RUN make

---> Using cache
---> 62e20c0b3115

Step 9/13 : RUN make install

---> Running in 79714e0da6e0

mkdir: can't create directory '/usr/local/bin': File exists
make: [Makefile:49: install-main] Error 1 (ignored)

mkdir has option -p and it suppress error if directory
has existed.


-p, --parents

no error if existing, make parent directories as needed


Change Summary

Incremental Difference

--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ SHAR = shar
66 PERL = perl
77 RM = rm -rf
88 VERSION = 2.1.5
9-MKDIR = mkdir
9+MKDIR = mkdir -p
1010 prefix = /usr/local
1111 PYTHON2 = python
1212 PYTHON3 = python
@@ -60,8 +60,8 @@ install-man-ja:
6060 cp -f nkf.1j $(prefix)/man/ja/man1/nkf.1
6161
6262 shar:
63- -mkdir nkf-$(VERSION)
64- -mkdir nkf-$(VERSION)/NKF.mod
63+ -$(MKDIR) nkf-$(VERSION)
64+ -$(MKDIR) nkf-$(VERSION)/NKF.mod
6565 for file in `cat MANIFEST`; \
6666 do \
6767 nkf -j -m0 $$file > nkf-$(VERSION)/$$file ; \
@@ -74,11 +74,11 @@ shar:
7474 -$(RM) nkf-$(VERSION)
7575
7676 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
8282 for file in `cat MANIFEST`; \
8383 do \
8484 cp $$file nkf-$(VERSION)/$$file ; \
Show on old repository browser