openbsd-ports/games/abuse/patches/patch-abuse_Makefile_in
naddy 05d8e6661d * fix C++ syntax errors revealed by GCC3
* use ${CXX} rather than ${CC} to link C++ code
2004-01-14 17:32:01 +00:00

52 lines
1.8 KiB
Plaintext

$OpenBSD: patch-abuse_Makefile_in,v 1.2 2004/01/14 17:32:01 naddy Exp $
--- abuse/Makefile.in.orig 1997-07-09 09:55:21.000000000 +0200
+++ abuse/Makefile.in 2004-01-14 18:16:09.000000000 +0100
@@ -37,10 +37,10 @@ AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = $(INSTALL) -s -o bin -g games -m 2755
+INSTALL_DATA = $(INSTALL) -o bin -g games -m 0664
+INSTALL_SCRIPT = $(INSTALL) -o bin -g games -m 0755
transform = @program_transform_name@
NORMAL_INSTALL = true
@@ -103,7 +103,7 @@ INCLUDES = -I$(srcdir)/inc -I$(srcdir)/.
-I$(srcdir)/src/net/inc -I$(srcdir)/src/net/unix
MYDEFS = -DMANAGE_MEM -DNO_CHECK
-CXXFLAGS = -g -O2
+CXXFLAGS = @CXXFLAGS@
COMPILE = $(CXX) $(DEFS) $(MYDEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(ADDCXXFLAGS) -o $@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -170,7 +170,7 @@ abuse_x11R6_LDFLAGS =
SCRIPTS = $(bin_SCRIPTS)
CFLAGS = @CFLAGS@
-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+LINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
DATA = $(pkgdata_DATA)
DIST_COMMON = Makefile.am Makefile.in abuse.in acinclude.m4 aclocal.m4 \
@@ -239,11 +239,11 @@ maintainer-clean-pkglibPROGRAMS:
install-pkglibPROGRAMS: $(pkglib_PROGRAMS)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(pkglibdir)
+ $(mkinstalldirs) $(bindir)
@list='$(pkglib_PROGRAMS)'; for p in $$list; do \
if test -f $$p; then \
- echo " $(INSTALL_PROGRAM) $$p $(pkglibdir)/`echo $$p|sed '$(transform)'`"; \
- $(INSTALL_PROGRAM) $$p $(pkglibdir)/`echo $$p|sed '$(transform)'`; \
+ echo " $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
else :; fi; \
done