X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2FMakefile.am;h=12dc5dfcd4aeef3e391b019b35adbbfead284a57;hb=702ac5383430e4dd00f3610a78dadf6f84e4296b;hp=5a20d151f838ed2bc9637d40720661e7f471173b;hpb=7ac98b8adec22a5ea7a8fc2f3593aab088583d0c;p=util-vserver.git diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 5a20d15..12dc5df 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -92,17 +92,13 @@ DISTCLEANFILES = FEATURES.txt AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = -LIBTOOL_CC = @LIBTOOL@ --tag CC -LIBTOOL_CXX = @LIBTOOL@ --tag CXX - if USE_DIETLIBC DIET = diet DIET_FLAGS = DIET_CC := $(DIET) $(DIET_FLAGS) $(CC) -DIET_LIBTOOL := $(LIBTOOL_CC) -VSERVER_LDFLAGS := -static +VSERVER_LDFLGS := -static else -VSERVER_LDFLAGS := +VSERVER_LDFLGS := endif if USE_DIETLIBC_COMPAT @@ -241,10 +237,6 @@ _install-vserverdir: if USE_DIETLIBC $(addsuffix $(EXEEXT), $(DIETPROGS)) \ $(addsuffix $(OBJEXT), $(DIETPROGS)) \ - : LIBTOOL=$(DIET_LIBTOOL) - -$(addsuffix $(EXEEXT), $(DIETPROGS)) \ -$(addsuffix $(OBJEXT), $(DIETPROGS)) \ : CC=$(DIET_CC) endif