From 41c0daec7913f3d218dec31b288f53f4607e5175 Mon Sep 17 00:00:00 2001 From: Tobias Schmidt Date: Thu, 24 Jun 2004 11:08:51 +0000 Subject: [PATCH] Tobias Schmidt: fixed scanlogd to use var_append [2004061214064920501] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3352 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/tschmidt/scanlogd/Makefile | 2 +- package/tschmidt/scanlogd/scanlogd.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tschmidt/scanlogd/Makefile b/package/tschmidt/scanlogd/Makefile index 469df5c03..27ab8cc64 100644 --- a/package/tschmidt/scanlogd/Makefile +++ b/package/tschmidt/scanlogd/Makefile @@ -18,7 +18,7 @@ OBJS = $(OBJS_COMMON) in_linux.o in_nids.o in_pcap.o default: libnids install: default - cp scanlogd $(ROOT)/$(PREFIX)/sbin/ + cp -f scanlogd $(ROOT)/$(PREFIX)/sbin/ linux: $(OBJS_COMMON) in_linux.o $(LD) $(LDFLAGS) $(OBJS_COMMON) in_linux.o -o scanlogd diff --git a/package/tschmidt/scanlogd/scanlogd.conf b/package/tschmidt/scanlogd/scanlogd.conf index 9b3be70b7..3e8082425 100644 --- a/package/tschmidt/scanlogd/scanlogd.conf +++ b/package/tschmidt/scanlogd/scanlogd.conf @@ -1,4 +1,4 @@ premake="echo PREFIX=$prefix > $builddir/scanlogd-$ver/Makefile" -premake="$premake; echo ROOT=$root >> $builddir/scanlogd-$ver/Makefile" -premake="$premake; cat $confdir/Makefile >> $builddir/scanlogd-$ver/Makefile" +var_append premake ";" "echo ROOT=$root >> $builddir/scanlogd-$ver/Makefile" +var_append premake ";" "cat $confdir/Makefile >> $builddir/scanlogd-$ver/Makefile" postmake="install_init scanlog $confdir/scanlogd.init"