From d088d4b6643862151cef3c47194945f0de77c70d Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 28 Sep 2011 15:33:22 -0500 Subject: [PATCH] configure: Correct INSTALL_DBDFLAGS and INSTALL_DBFLAGS fixes lp:861627 --- configure/RULES.Db | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configure/RULES.Db b/configure/RULES.Db index e0d0fcf70..556218303 100644 --- a/configure/RULES.Db +++ b/configure/RULES.Db @@ -1,10 +1,9 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found +# EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* #RULES.Db @@ -23,8 +22,8 @@ vpath %.acs $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR) ##################################################### dbdflags # dbExpand -INSTALL_DBDFLAGS += -I $(INSTALL_LOCATION)/dbd -INSTALL_DBFLAGS += -I $(INSTALL_LOCATION)/db +INSTALL_DBDFLAGS += -I $(INSTALL_DBD) +INSTALL_DBFLAGS += -I $(INSTALL_DB) DBDFLAGS = $(USR_DBDFLAGS) -I . -I .. $(INSTALL_DBDFLAGS) $(RELEASE_DBDFLAGS) DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) -I. -I.. $(INSTALL_DBFLAGS) $(RELEASE_DBFLAGS)