summaryrefslogtreecommitdiff
path: root/japanese/jvim3/files/patch-src-makjunix.mak
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2014-08-29 16:31:26 +0000
committerHiroki Sato <hrs@FreeBSD.org>2014-08-29 16:31:26 +0000
commit0dbd0e7c9cb2b0cf3327c76760ef93548c5f6ad0 (patch)
treefa4f75830211bbf37e4b91d0f6b2326e24d494b7 /japanese/jvim3/files/patch-src-makjunix.mak
parentwww/py-django-assets: Compress and merge CSS and Javascript files (diff)
- Fix build. A "grep" directory conflicted with "grep" target.
- Move generation of a file to post-build.
Notes
Notes: svn path=/head/; revision=366528
Diffstat (limited to 'japanese/jvim3/files/patch-src-makjunix.mak')
-rw-r--r--japanese/jvim3/files/patch-src-makjunix.mak12
1 files changed, 7 insertions, 5 deletions
diff --git a/japanese/jvim3/files/patch-src-makjunix.mak b/japanese/jvim3/files/patch-src-makjunix.mak
index 04b60f200fda..690346cb361b 100644
--- a/japanese/jvim3/files/patch-src-makjunix.mak
+++ b/japanese/jvim3/files/patch-src-makjunix.mak
@@ -1,5 +1,5 @@
---- src/makjunix.mak.orig 2014-03-14 23:13:33.000000000 +0900
-+++ src/makjunix.mak 2014-03-14 23:20:30.000000000 +0900
+--- src/makjunix.mak.orig 2014-08-30 01:12:22.000000000 +0900
++++ src/makjunix.mak 2014-08-30 01:19:58.000000000 +0900
@@ -72,19 +72,20 @@
@@ -59,7 +59,7 @@
GOBJ = grep.o alloc.o charset.o kanji.o regexp.o regsub.o u2s.o s2u.o
-all: $(TARGET) grep
-+all: $(PROG) grep
++all: $(PROG) grep.bin
-$(TARGET): $(OBJ) version.c
- $(CC) $(CFLAGS) version.c
@@ -68,8 +68,10 @@
+ $(CC) -c $(CFLAGS) version.c
+ $(CC) -o $(PROG) $(OBJ) version.o $(LIBS) $(FEPLIBS)
- grep: $(GOBJ)
- $(CC) -o grep/grep $(GOBJ) $(LIBS) $(FEPLIBS)
+-grep: $(GOBJ)
+- $(CC) -o grep/grep $(GOBJ) $(LIBS) $(FEPLIBS)
++grep.bin: $(GOBJ)
++ $(CC) -o grep.bin $(GOBJ) $(LIBS) $(FEPLIBS)
debug: $(OBJ) version.c
- $(CC) $(CFLAGS) version.c