From cebab6f35a4b3e343d1a85cad21919a3dc5122c8 Mon Sep 17 00:00:00 2001 From: Manuel Reimer Date: Sat, 7 Apr 2018 11:40:46 +0200 Subject: Final Makefile fixes. Packaging should be much easier now --- tools/convpic/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tools/convpic/Makefile') diff --git a/tools/convpic/Makefile b/tools/convpic/Makefile index 3d57aa4..eb91742 100644 --- a/tools/convpic/Makefile +++ b/tools/convpic/Makefile @@ -2,7 +2,7 @@ # Makefile for the GraphLCD tool convpic # --include ../../Make.config +include ../../Make.config PRGNAME = convpic @@ -32,12 +32,11 @@ $(PRGNAME): $(OBJS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) -lglcdgraphics -lstdc++ -o $(PRGNAME) install: $(PRGNAME) - install -d $(BINDIR) - install -m 755 -o root -g root $(HAVE_STRIP) $(PRGNAME) $(BINDIR) + install -d $(DESTDIR)$(BINDIR) + install -m 755 $(HAVE_STRIP) $(PRGNAME) $(DESTDIR)$(BINDIR) uninstall: - rm -f $(BINDIR)/$(PRGNAME) + rm -f $(DESTDIR)$(BINDIR)/$(PRGNAME) clean: @-rm -f $(OBJS) $(DEPFILE) $(PRGNAME) *~ - -- cgit v1.2.3