From 3d28b13b1f029c31946cffd48fd82b955b5497d2 Mon Sep 17 00:00:00 2001 From: Stefan Wold Date: Sat, 18 Jan 2014 17:16:52 +0100 Subject: [PATCH] cdrtools: removing smake as dependency --- cd/cdrtools/BUILD | 9 ++------- cd/cdrtools/DEPENDS | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cd/cdrtools/BUILD b/cd/cdrtools/BUILD index ac9de4b5662..d7f79df9319 100644 --- a/cd/cdrtools/BUILD +++ b/cd/cdrtools/BUILD @@ -1,12 +1,7 @@ -if `module_installed smake`; then - THISMAKE=smake -else - THISMAKE=make -fi && -$THISMAKE INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root LINKMODE="dynamic" \ +make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root LINKMODE="dynamic" \ CPPOPTX="$CPPFLAGS" COPTX="$CFLAGS" LDOPTX="$LDFLAGS" GMAKE_NOWARN="true" && prepare_install && -$THISMAKE INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root MANDIR=man LINKMODE="dynamic" \ +make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root MANDIR=man LINKMODE="dynamic" \ CPPOPTX="$CPPFLAGS" COPTX="$CFLAGS" LDOPTX="$LDFLAGS" GMAKE_NOWARN="true" install && # cdrkit compatibility: diff --git a/cd/cdrtools/DEPENDS b/cd/cdrtools/DEPENDS index b04fab7c393..95f8003972f 100644 --- a/cd/cdrtools/DEPENDS +++ b/cd/cdrtools/DEPENDS @@ -1,4 +1,3 @@ depends acl -optional_depends "smake" "" "" "for Schilly makefiles" optional_depends "dirsplit" "" "" "for cdrkit compatibility and optimal file layout on discs"