X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile;h=6c01dc29537a7926f1e57c4fe115334c4cdc036c;hb=50496b2170cbe87b4c13f89f274aa2f181522bb9;hp=67c10302b66c2696d7ada9d6d7e03694b51690c9;hpb=e3a39000e295e4bd6faff97decc31e6cb4520bb1;p=git.git diff --git a/Makefile b/Makefile index 67c10302..6c01dc29 100644 --- a/Makefile +++ b/Makefile @@ -89,7 +89,7 @@ SCRIPT_SH = \ git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \ git-applymbox.sh git-applypatch.sh git-am.sh \ git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \ - git-merge-resolve.sh git-grep.sh + git-merge-resolve.sh git-merge-ours.sh git-grep.sh SCRIPT_PERL = \ git-archimport.perl git-cvsimport.perl git-relink.perl \ @@ -189,9 +189,9 @@ endif ifeq ($(uname_S),SunOS) NEEDS_SOCKET = YesPlease NEEDS_NSL = YesPlease + NEEDS_LIBICONV = YesPlease SHELL_PATH = /bin/bash NO_STRCASESTR = YesPlease - CURLDIR = /opt/sfw INSTALL = ginstall TAR = gtar PLATFORM_DEFINES += -D__EXTENSIONS__ @@ -397,8 +397,8 @@ doc: test: all $(MAKE) -C t/ all -test-date$X: test-date.c date.o - $(CC) $(ALL_CFLAGS) -o $@ test-date.c date.o +test-date$X: test-date.c date.o ctype.o + $(CC) $(ALL_CFLAGS) -o $@ test-date.c date.o ctype.o test-delta$X: test-delta.c diff-delta.o patch-delta.o $(CC) $(ALL_CFLAGS) -o $@ $^ @@ -413,7 +413,6 @@ check: install: $(PROGRAMS) $(SCRIPTS) $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(bindir)) $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(call shellquote,$(DESTDIR)$(bindir)) - sh ./cmd-rename.sh $(call shellquote,$(DESTDIR)$(bindir)) $(MAKE) -C templates install $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR)) $(INSTALL) $(PYMODULES) $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))