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

diff --git a/Makefile b/Makefile
index 9d09806..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 := 
@@ -46,7 +46,7 @@ rocks := $(rocks:%=data/rock%.png)
 graphics := data/ship.png data/icon.png data/life.png data/font.png $(rocks)
 
 INSTALL := install
-INSTALL_PROGRAM := $(INSTALL) $(shell sh -c 'test "$$UID" "=" "0" && echo "-o games -g games"')
+INSTALL_PROGRAM := $(INSTALL)
 INSTALL_DATA := $(INSTALL) -m 644
 
 
@@ -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,17 +108,18 @@ 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:
+rminstalldirs: uninstall-data
 	if [ -d $(DESTDIR)$(pkgdatadir) ]; then rmdir $(DESTDIR)$(pkgdatadir); fi
 
 install: all mkinstalldirs install-program install-data
 
 install-program: program
-	$(INSTALL_PROGRAM) ./vor $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) ./vor $(DESTDIR)$(bindir)/
 
-install-data: data
+install-data: data mkinstalldirs
 	$(INSTALL_DATA) ./data/*.png $(DESTDIR)$(pkgdatadir)/
 	$(INSTALL_DATA) ./data/*.wav $(DESTDIR)$(pkgdatadir)/
 	$(INSTALL_DATA) ./data/*.xm $(DESTDIR)$(pkgdatadir)/