Final Makefile fixes. Packaging should be much easier now

8 files changed, 31 insertions, 38 deletions

diff --git a/tools/Makefile b/tools/Makefile
index d923139..139378a 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,7 +3,7 @@
 #
 
 
--include ../Make.config
+include ../Make.config
 
 ### Targets:
 
@@ -39,7 +39,7 @@ endif
 	@$(MAKE) -C showtext uninstall
 	@$(MAKE) -C lcdtestpattern uninstall
 	@$(MAKE) -C skintest uninstall
- 
+
 clean:
 	@$(MAKE) -C convpic clean
 	@$(MAKE) -C crtfont clean
@@ -48,4 +48,3 @@ clean:
 	@$(MAKE) -C showtext clean
 	@$(MAKE) -C lcdtestpattern clean
 	@$(MAKE) -C skintest clean
-
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) *~
-
diff --git a/tools/crtfont/Makefile b/tools/crtfont/Makefile
index 6c6abdf..614c135 100644
--- a/tools/crtfont/Makefile
+++ b/tools/crtfont/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the GraphLCD tool crtfont
 #
 
--include ../../Make.config
+include ../../Make.config
 
 PRGNAME = crtfont
 
@@ -31,12 +31,11 @@ $(PRGNAME): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -rdynamic $(OBJS) $(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) *~
-
diff --git a/tools/genfont/Makefile b/tools/genfont/Makefile
index f97d8e7..c4aab2f 100644
--- a/tools/genfont/Makefile
+++ b/tools/genfont/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the GraphLCD tool crtfont
 #
 
--include ../../Make.config
+include ../../Make.config
 
 PRGNAME = genfont
 
@@ -34,12 +34,11 @@ $(PRGNAME): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -rdynamic $(OBJS) $(LIBDIRS) $(LIBS) -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) *~
-
diff --git a/tools/lcdtestpattern/Makefile b/tools/lcdtestpattern/Makefile
index e29305b..29fe792 100644
--- a/tools/lcdtestpattern/Makefile
+++ b/tools/lcdtestpattern/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the GraphLCD tool showpic
 #
 
--include ../../Make.config
+include ../../Make.config
 
 PRGNAME = lcdtestpattern
 
@@ -32,12 +32,11 @@ $(PRGNAME): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) -lglcddrivers -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) *~
-
diff --git a/tools/showpic/Makefile b/tools/showpic/Makefile
index de7560a..967ecf9 100644
--- a/tools/showpic/Makefile
+++ b/tools/showpic/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the GraphLCD tool showpic
 #
 
--include ../../Make.config
+include ../../Make.config
 
 PRGNAME = showpic
 
@@ -32,12 +32,11 @@ $(PRGNAME): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) -lglcdgraphics -lglcddrivers -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) *~
-
diff --git a/tools/showtext/Makefile b/tools/showtext/Makefile
index 516f966..20b3381 100644
--- a/tools/showtext/Makefile
+++ b/tools/showtext/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the GraphLCD tool showtext
 #
 
--include ../../Make.config
+include ../../Make.config
 
 PRGNAME = showtext
 
@@ -32,12 +32,11 @@ $(PRGNAME): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) -lglcdgraphics -lglcddrivers -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) *~
-
diff --git a/tools/skintest/Makefile b/tools/skintest/Makefile
index fe73388..0c0f43e 100644
--- a/tools/skintest/Makefile
+++ b/tools/skintest/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the GraphLCD tool showtext
 #
 
--include ../../Make.config
+include ../../Make.config
 
 PRGNAME = skintest
 
@@ -32,11 +32,11 @@ $(PRGNAME): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -rdynamic $(OBJS) $(LIBS) $(LIBDIRS) -lglcdgraphics -lglcddrivers -lglcdskin -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) *~