[BACK]Return to patch-aa CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / net / unison / patches

Annotation of pkgsrc/net/unison/patches/patch-aa, Revision 1.10

1.10    ! wiz         1: $NetBSD: patch-aa,v 1.9 2011/02/25 20:03:01 wiz Exp $
1.1       mjl         2:
1.10    ! wiz         3: --- Makefile.orig      2011-04-16 20:35:38.000000000 +0000
1.4       adrianp     4: +++ Makefile
1.9       wiz         5: @@ -49,7 +49,7 @@ all:: INSTALL
1.4       adrianp     6:
                      7:  INSTALL: $(NAME)$(EXEC_EXT)
1.6       tonio       8:  # file isn't made for OS X, so check that it's there first
                      9: -      (if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi)
                     10: +##    (if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi)
1.4       adrianp    11:
1.5       tonio      12:  ########################################################################
                     13:  ## Miscellaneous developer-only switches
1.10    ! wiz        14: @@ -80,7 +80,7 @@ include Makefile.OCaml
1.1       mjl        15:  ######################################################################
                     16:  # Installation
                     17:
                     18: -INSTALLDIR = $(HOME)/bin/
1.8       wiz        19: +INSTALLDIR = ${DESTDIR}$(PREFIX)/bin/
1.1       mjl        20:
1.6       tonio      21:  # This has two names because on OSX the file INSTALL shadows the target 'install'!
                     22:  install: doinstall
1.10    ! wiz        23: @@ -92,9 +92,7 @@ text:
1.8       wiz        24:        $(MAKE) -C .. text
1.6       tonio      25:
                     26:  doinstall: $(NAME)$(EXEC_EXT)
1.1       mjl        27: -      -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
                     28:        cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
1.6       tonio      29: -      cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
1.10    ! wiz        30:
1.1       mjl        31:
                     32:  ######################################################################
1.10    ! wiz        33: @@ -350,7 +348,6 @@ tags:
1.9       wiz        34:            $(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt \
                     35:            ; fi
1.1       mjl        36:
                     37: -all:: TAGS
                     38:
1.4       adrianp    39:  TAGS:
1.1       mjl        40:        $(MAKE) tags

CVSweb <webmaster@jp.NetBSD.org>