Ensure parser files are read from the right location, this avoids

bison/yacc synchronization bugs, and allows for SEPARATE_BUILD to
be set.
This commit is contained in:
espie 2000-07-03 00:39:08 +00:00
parent 4baaf01b42
commit e6b22a8b8d
2 changed files with 19 additions and 1 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2000/07/02 23:44:17 espie Exp $
# $OpenBSD: Makefile,v 1.3 2000/07/03 00:39:08 espie Exp $
DISTNAME= qvwm-1.1.8
CATEGORIES= x11
@ -19,6 +19,12 @@ CONFIGURE_STYLE= gnu
FLAVORS= esound imlib
FLAVOR?=
# the build-scheme will get confused otherwise
post-patch:
rm ${WRKDIST}/src/yaccsrc.{cc,h}
SEPARATE_BUILD=flavored
.if ${FLAVOR:L:Mesound}
LIB_DEPENDS+=esd.2.::audio/esound
CONFIGURE_ARGS+=--with-esd-prefix=${LOCALBASE}

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2000/07/03 00:39:09 espie Exp $
--- src/Makefile.in.orig Mon Jul 3 02:22:01 2000
+++ src/Makefile.in Mon Jul 3 02:22:11 2000
@@ -86,7 +86,7 @@ qvwm_SOURCES = button.cc button.h callba
# VPATH is not enough for lexsrc.ll and yaccsrc.yy
-DEFS = -DIMGDIR=\"@QVWMDIR@/images\" -DSNDDIR=\"@QVWMDIR@/sounds\" -DQVWMDIR=\"@QVWMDIR@\" -DPATH_RM=\"@PATH_RM@\" -DHAVE_CONFIG_H -I$(top_builddir) -I$(srcdir)
+DEFS = -DIMGDIR=\"@QVWMDIR@/images\" -DSNDDIR=\"@QVWMDIR@/sounds\" -DQVWMDIR=\"@QVWMDIR@\" -DPATH_RM=\"@PATH_RM@\" -DHAVE_CONFIG_H -I. -I$(top_builddir) -I$(srcdir)
qvwm_LDADD = @LEXLIB@