$OpenBSD$ --- classes/src/Makefile.in.orig Sun Jan 9 02:46:01 2000 +++ classes/src/Makefile.in Mon Oct 21 00:06:18 2002 @@ -1,4 +1,4 @@ -ARTSPPINC = -I@artspp@/include +ARTSPPINC = -I${PREFIX}/include CFDINC = -I../include -I../../include SNMPPINC = -I../../snmp++/classes/include OBJECTS = CflowdAsMatrix.lo \ @@ -66,7 +66,8 @@ HDRFILES = ../include/CflowdAsMatrix.hh ../include/CflowdTosTable.hh \ ../include/CflowdUint16Uint16Key.hh \ ../include/CflowdUint64TrafficCounter.hh \ - ../include/CflowdVersion.hh + ../include/CflowdVersion.hh \ + ${PREFIX}/include/caida_t.h CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ top_builddir = ../.. @@ -77,7 +78,7 @@ LIBTOOL = @ /bin/sh $(top_builddir)/libt all: ../lib/libCfd.la ../lib/libCfd.la: ${OBJECTS} - ${LIBTOOL} ${CXX} -o ../lib/libCfd.la ${OBJECTS} -rpath @libdir@ -versiob-info ${C_R_A} + ${LIBTOOL} ${CXX} -o ../lib/libCfd.la ${OBJECTS} -rpath ${PREFIX}/lib -versiob-info ${C_R_A} .cc.o: ${LIBTOOL} ${CXX} ${CXXFLAGS} ${CFDINC} ${ARTSPPINC} -c $< @@ -90,24 +91,24 @@ CflowdCisco.lo: CflowdCisco.cc ../includ -c CflowdCisco.cc CflowdCiscoMap.lo: CflowdCiscoMap.cc ../include/*.hh \ - @artspp@/include/caida_t.h @artspp@/include/ArtsPrimitive.hh + ${PREFIX}/include/caida_t.h ${PREFIX}/include/ArtsPrimitive.hh ${LIBTOOL} ${CXX} ${CXXFLAGS} ${CFDINC} ${ARTSPPINC} ${SNMPPINC} \ -c CflowdCiscoMap.cc CflowdInterfaceInfo.lo: CflowdInterfaceInfo.cc \ ../include/CflowdInterfaceInfo.hh \ - @artspp@/include/caida_t.h + ${PREFIX}/include/caida_t.h ${LIBTOOL} ${CXX} ${CXXFLAGS} ${CFDINC} ${ARTSPPINC} ${SNMPPINC} \ -c CflowdInterfaceInfo.cc -CflowdConfig.lo: CflowdConfig.cc ../include/*.hh @artspp@/include/caida_t.h \ - @artspp@/include/ArtsPrimitive.hh +CflowdConfig.lo: CflowdConfig.cc ../include/*.hh ${PREFIX}/include/caida_t.h \ + ${PREFIX}/include/ArtsPrimitive.hh ${LIBTOOL} ${CXX} ${CXXFLAGS} ${CFDINC} ${ARTSPPINC} ${SNMPPINC} \ -c CflowdConfig.cc CflowdTableRequest.lo: CflowdTableRequest.cc ../include/*.hh \ - @artspp@/include/caida_t.h \ - @artspp@/include/ArtsPrimitive.hh + ${PREFIX}/include/caida_t.h \ + ${PREFIX}/include/ArtsPrimitive.hh ${LIBTOOL} ${CXX} ${CXXFLAGS} ${CFDINC} ${ARTSPPINC} ${SNMPPINC} \ -c CflowdTableRequest.cc @@ -136,19 +137,19 @@ filtexpr.cc: filtexpr.lex flex -Pfiltexpr -ofiltexpr.cc filtexpr.lex install: ../lib/libCfd.la - ${LIBTOOL} ../../install-sh -c -m 444 ../lib/libCfd.la @libdir@/libCfd.la + ${LIBTOOL} ../../install-sh -c -m 444 ../lib/libCfd.la ${PREFIX}/lib/libCfd.la for header in ${HDRFILES}; do \ - ../../install-sh -c -m 444 $$header @includedir@/ ; \ + ../../install-sh -c -m 444 $$header ${PREFIX}/include/ ; \ done tarball:: - if [ -f @libdir@/libCfd.a ]; then \ - @TAR@ -rvf ../../@PKG_VERSION@_@OSNAME@.tar @libdir@/libCfd.a ; \ + if [ -f ${PREFIX}/lib/libCfd.a ]; then \ + @TAR@ -rvf ../../@PKG_VERSION@_@OSNAME@.tar ${PREFIX}/lib/libCfd.a ; \ fi - if [ -f @libdir@/libCfd.la ]; then \ - . @libdir@/libCfd.la ; \ + if [ -f ${PREFIX}/lib/libCfd.la ]; then \ + . ${PREFIX}/lib/libCfd.la ; \ for libfile in $$library_names ; do \ - @TAR@ -uvf ../../@PKG_VERSION@_@OSNAME@.tar @libdir@/$$libfile ; \ + @TAR@ -uvf ../../@PKG_VERSION@_@OSNAME@.tar ${PREFIX}/lib/$$libfile ; \ done ; \ fi