File madbomber-0.2.5-makefile.diff of Package madbomber

Overview Repositories Revisions Requests Users Attributes Meta

File madbomber-0.2.5-makefile.diff of Package madbomber

--- Makefile
+++ Makefile
@@ -9,8 +9,8 @@
 
 # User-definable stuff:
 
-BIN_PREFIX=/usr/local/bin/
-DATA_PREFIX=/usr/share/madbomber/
+BIN_PREFIX=/usr/bin/
+DATA_PREFIX=/usr/share/games/madbomber/
 
 
 # Defaults for Linux:
@@ -19,7 +19,7 @@
 TARGET_DEF=LINUX
 SDL_CFLAGS := $(shell sdl-config --cflags)
 SDL_LDFLAGS := $(shell sdl-config --libs)
-
+CXX = g++
 
 # Sound-related definitions:
 
@@ -31,7 +31,7 @@
 # Stuff we pass to the compiler:
 
 CFLAGS=-Wall $(SDL_CFLAGS) \
-	-DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) -D$(TARGET_DEF)
+	-DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) -D$(TARGET_DEF) $(RPM_OPT_FLAGS)
 SDL_LIB=$(MIXER) $(IMAGE) $(SDL_LDFLAGS)
 
 
@@ -40,13 +40,13 @@
 all:	$(TARGET)
 
 install:
-	mkdir -p $(DATA_PREFIX)
-	cp -r data/* $(DATA_PREFIX)
-	chown -R root.root $(DATA_PREFIX)
-	chmod -R a+rX,g-w,o-w $(DATA_PREFIX)
-	cp madbomber $(BIN_PREFIX)
-	chown root.root $(BIN_PREFIX)/madbomber
-	chmod a+rx,g-w,o-w $(BIN_PREFIX)/madbomber
+	install -d -m 755 $(DESTDIR)$(DATA_PREFIX)
+	install -d -m 755 $(DESTDIR)$(BIN_PREFIX)
+	cp -r data/* $(DESTDIR)$(DATA_PREFIX)
+	chown -R root:root $(DESTDIR)$(DATA_PREFIX)
+	chmod -R a+rX,g-w,o-w $(DESTDIR)$(DATA_PREFIX)
+	cp madbomber $(DESTDIR)$(BIN_PREFIX)
+	chmod 755 $(DESTDIR)$(BIN_PREFIX)/madbomber
 
 
 nosound:
@@ -78,7 +78,7 @@
 # Main executable:
 
 $(TARGET):	madbomber.o
-	$(CC) $(CFLAGS) madbomber.o -o $(TARGET) $(SDL_LIB) -lm
+	$(CXX) $(CFLAGS) madbomber.o -o $(TARGET) $(SDL_LIB) -lm
 
 
 # Main object:

Places

File madbomber-0.2.5-makefile.diff of Package madbomber

Places