From bf84c5815fb6ce1c78b6f028ceb35ff1035d7afa Mon Sep 17 00:00:00 2001 From: Andrew Bettison Date: Tue, 3 Dec 2013 14:29:13 +1030 Subject: [PATCH] Fix 'make install' target, add 'make uninstall' Define $(sbindir) and $(exec_prefix) Define $(INSTALL), $(INSTALL_PROGRAM) and $(INSTALL_DATA) Use $(RM) instead of rm -f --- Makefile.in | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 151c104f..444d1a58 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,7 @@ -DESTDIR= prefix=@prefix@ -bindir=@sbindir@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ NACL_BASE= nacl/src include $(NACL_BASE)/nacl.mk @@ -72,6 +73,11 @@ CFLAGS+=-Wall -Wno-unused-value CFLAGS+=-DSHA2_USE_INTTYPES_H -D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__=1 # OSX magic to compensate for the Solaris magic CFLAGS+=-D_DARWIN_C_SOURCE + +INSTALL= install +INSTALL_PROGRAM=$(INSTALL) +INSTALL_DATA= $(INSTALL) -m 644 + -include Makefile.dbg DEFS= @DEFS@ @@ -130,10 +136,13 @@ libmonitorclient.a: $(MONITORCLIENTOBJS) version.o @$(AR) -cr $@ $(MONITORCLIENTOBJS) version.o install: servald - $(INSTALL) -D servald $(DESTDIR)$(sbindir) + $(INSTALL_PROGRAM) -D servald $(DESTDIR)$(sbindir)/servald + +uninstall: + $(RM) $(DESTDIR)$(sbindir)/servald clean: - @rm -f $(OBJS) \ + @$(RM) $(OBJS) \ tfw_createfile.o version.o \ fakeradio.o fakeradio \ tfw_createfile servald \