c02b407e92
filesystem without interference from devel/CVS metadata. PKGNAME stays the same. Discussed with agc.
31 lines
1.2 KiB
Text
31 lines
1.2 KiB
Text
$NetBSD: patch-ac,v 1.1 2007/05/27 09:49:51 schmonz Exp $
|
|
|
|
--- src/Makefile.in.orig 2005-09-28 05:32:23.000000000 +0200
|
|
+++ src/Makefile.in
|
|
@@ -86,7 +86,7 @@ am_cvs_OBJECTS = add.$(OBJEXT) admin.$(O
|
|
version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \
|
|
wrapper.$(OBJEXT) zlib.$(OBJEXT)
|
|
cvs_OBJECTS = $(am_cvs_OBJECTS)
|
|
-cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
|
|
+cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a
|
|
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
|
|
SCRIPTS = $(bin_SCRIPTS)
|
|
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
|
@@ -199,7 +199,7 @@ target_alias = @target_alias@
|
|
# some namespace hackery going on that maybe shouldn't be. Long term fix is to
|
|
# try and remove naming ocnflicts and fix Automake to allow particular includes
|
|
# to be attached only to particular object files. Short term fix is either or.
|
|
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
|
|
+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
|
|
bin_SCRIPTS = cvsbug
|
|
|
|
# The cvs executable
|
|
@@ -278,7 +278,7 @@ cvs_SOURCES = \
|
|
cvs_LDADD = \
|
|
../diff/libdiff.a \
|
|
../lib/libcvs.a \
|
|
- ../zlib/libz.a
|
|
+ -lz
|
|
|
|
|
|
# extra clean targets
|