X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=Makefile;h=555fb963380f564abfdf4a090e6763ee3550d53d;hp=8b93708893107bc33cf9c325f0f509d3e1f6314d;hb=29d7062c011d38b123dd71aabd3b184d4b18348f;hpb=d37e411eab8059daba1fbd9a8a7a73686cb5fa8c

diff --git a/Makefile b/Makefile
index 8b93708..555fb96 100644
--- a/Makefile
+++ b/Makefile
@@ -15,12 +15,12 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-prefix = /usr
+prefix = /usr/local
 exec_prefix = $(prefix)
 
-datadir = $(prefix)/share/games
-pkgdatadir = $(datadir)/vor
-bindir = $(exec_prefix)/games
+datarootdir = $(prefix)/share
+pkgdatadir = $(datarootdir)/vor
+bindir = $(exec_prefix)/bin
 
 CFLAGS := -Wall -O3
 LDFLAGS := 
@@ -64,8 +64,7 @@ data: $(graphics)
 program: vor
 
 %.o: %.c
-	@echo compiling $@ from $<
-	@$(CC) $(cflags) -c -o $@ $<
+	$(CC) $(cflags) -c -o $@ $<
 
 $(my_objects): config.h
 
@@ -90,8 +89,7 @@ sound.o: sound.h args.h common.h
 sprite.o: sprite.h common.h
 
 vor: $(objects)
-	@echo linking $@ from $^
-	@$(CC) $^ $(ldflags) -o $@
+	$(CC) $^ $(ldflags) -o $@
 
 include gfx.mk
 
@@ -110,7 +108,8 @@ data-clean:
 	rm -f $(graphics) font_guts font_guts.pov
 
 mkinstalldirs:
-	if [ ! -d $(DESTDIR)$(pkgdatadir) ]; then mkdir $(DESTDIR)$(pkgdatadir); fi
+	if [ ! -d $(DESTDIR)$(pkgdatadir) ]; then mkdir -p $(DESTDIR)$(pkgdatadir); fi
+	if [ ! -d $(DESTDIR)$(bindir) ]; then mkdir -p $(DESTDIR)$(bindir); fi
 
 rminstalldirs: uninstall-data
 	if [ -d $(DESTDIR)$(pkgdatadir) ]; then rmdir $(DESTDIR)$(pkgdatadir); fi
@@ -118,7 +117,7 @@ rminstalldirs: uninstall-data
 install: all mkinstalldirs install-program install-data
 
 install-program: program
-	$(INSTALL_PROGRAM) ./vor $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) ./vor $(DESTDIR)$(bindir)/
 
 install-data: data mkinstalldirs
 	$(INSTALL_DATA) ./data/*.png $(DESTDIR)$(pkgdatadir)/