Fix build without obj dir. From todd@

This commit is contained in:
matthieu 2006-12-04 20:55:17 +00:00
parent 3e2941f98a
commit 03d555ad9a
2 changed files with 4 additions and 2 deletions

View File

@ -9,6 +9,7 @@ X11BASE?= /usr/X11R6
CFLAGS+= -I${X11BASE}/include -I${.CURDIR} -I${.CURDIR}/.. \
-I${.CURDIR}/../libs
LDADD+= -L${X11BASE}/lib
FVWMLIBDIR= ${X11BASE}/lib/X11/fvwm
MANDIR= ${X11BASE}/man/cat
@ -16,7 +17,7 @@ MANDIR= ${X11BASE}/man/cat
obj: _xenocara_obj
.if exists(${.CURDIR}/../libs/${__objdir})
LDADD+= -L${X11BASE}/lib -L${.CURDIR}/../libs/${__objdir} -lfvwm
LDADD+= -L${.CURDIR}/../libs/${__objdir} -lfvwm
DPADD+= ${.CURDIR}/../libs/${__objdir}/libfvwm.a
.else
LDADD+= -L${.CURDIR}/../libs -lfvwm

View File

@ -8,6 +8,7 @@ FVWM_MAKEFILE_INC = done
X11BASE?= /usr/X11R6
CFLAGS+= -I${X11BASE}/include -I${.CURDIR}/../.. -I${.CURDIR}/../../libs
LDADD+= -L${X11BASE}/lib
FVWMLIBDIR= ${X11BASE}/lib/X11/fvwm
MANDIR= ${X11BASE}/man/cat
@ -15,7 +16,7 @@ MANDIR= ${X11BASE}/man/cat
obj: _xenocara_obj
.if exists(${.CURDIR}/../../libs/${__objdir})
LDADD+= -L${X11BASE}/lib -L${.CURDIR}/../../libs/${__objdir} -lfvwm
LDADD+= -L${.CURDIR}/../../libs/${__objdir} -lfvwm
DPADD+= ${.CURDIR}/../../libs/${__objdir}/libfvwm.a
.else
LDADD+= -L${.CURDIR}/../../libs -lfvwm