File xlogical-1.0-7.dif of Package xlogical

Overview Repositories Revisions Requests Users Attributes Meta

File xlogical-1.0-7.dif of Package xlogical

--- Makefile.am
+++ Makefile.am
@@ -6,26 +6,22 @@
 SCOREFILE = xlogical.scores
 FILEOWNER = bin
 FILEGROUP = games
-install-exec-am: $(bin_PROGRAMS)
-	-chown $(FILEOWNER):$(FILEGROUP) $(bindir)/xlogical
-	chmod 2755 $(bindir)/xlogical
+
 install-data-am: $(DATAFILES) $(SCOREFILE)
-	$(SHELL) ./mkinstalldirs $(datadir)/xlogical
-	cp $(DATAFILES) $(datadir)/xlogical
-	chmod 640 $(datadir)/xlogical/xlogical.levels
-	chmod 644 $(datadir)/xlogical/xlogical.properties
-	-chown -R $(FILEOWNER):$(FILEGROUP) $(datadir)/xlogical
-	$(SHELL) ./mkinstalldirs $(localstatedir)/xlogical
-	cp $(SCOREFILE) $(localstatedir)/xlogical
-	-chown $(FILEOWNER):$(FILEGROUP) $(localstatedir)/xlogical/xlogical.scores
-	chmod 660 $(localstatedir)/xlogical/xlogical.scores
+	$(SHELL) ./mkinstalldirs $(DESTDIR)$(datadir)/xlogical
+	cp $(DATAFILES) $(DESTDIR)$(datadir)/xlogical
+	chmod 640 $(DESTDIR)$(datadir)/xlogical/xlogical.levels
+	chmod 644 $(DESTDIR)$(datadir)/xlogical/xlogical.properties
+	$(SHELL) ./mkinstalldirs $(DESTDIR)$(localstatedir)/xlogical
+	cp $(SCOREFILE) $(DESTDIR)$(localstatedir)/xlogical
+	chmod 660 $(DESTDIR)$(localstatedir)/xlogical/xlogical.scores
 uninstall:
 	rm -f $(datadir)/xlogical/xlogical.levels
 	rm -f $(datadir)/xlogical/xlogical.properties
 	rmdir $(datadir)/xlogical
 	rm -f $(localstatedir)/xlogical/xlogical.scores
 	rmdir $(localstatedir)/xlogical
-CXXFLAGS = -g -O2 -Wall
+#CXXFLAGS = -g -O2 -Wall
 CPPFLAGS = @CPPFLAGS@ -DDATA_DIR=\"@datadir@/xlogical\" -DSCORE_DIR=\"@localstatedir@/xlogical\"
 SUBDIRS = sound images music
 xlogical_SOURCES = anim.cpp \
--- configure.in
+++ configure.in
@@ -18,11 +18,14 @@
 LIBS="$LIBS $SDL_LIBS"
 
 dnl Checking for SDL_image
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
 AC_CHECK_LIB(SDL_image, main,:,AC_MSG_ERROR([ *** Cannot find SDL_image]))
 LIBS="$LIBS -lSDL_image"
 dnl Checking for SDL_mixer
 AC_CHECK_LIB(SDL_mixer, main,:,AC_MSG_ERROR([ *** Cannot find SDL_mixer]))
 LIBS="$LIBS -lSDL_mixer"
+AC_LANG_RESTORE
 
 CPPFLAGS="$CPPFLAGS $TARGETCPU"
 
--- images/Makefile.am
+++ images/Makefile.am
@@ -3,10 +3,10 @@
 SHELL=@SHELL@
 
 install-data-am:
-	$(SHELL) ./../mkinstalldirs $(datadir)/xlogical
-	$(SHELL) ./../mkinstalldirs $(datadir)/xlogical/images
-	cp *.{bmp,jpg} $(datadir)/xlogical/images
-	chmod 644 $(datadir)/xlogical/images/*.{bmp,jpg}
+	$(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical
+	$(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical/images
+	cp *.{bmp,jpg} $(DESTDIR)$(datadir)/xlogical/images
+	chmod 644 $(DESTDIR)$(datadir)/xlogical/images/*.{bmp,jpg}
 uninstall:
 	rm -f $(datadir)/xlogical/images/*.{bmp,jpg}
 	rmdir $(datadir)/xlogical/images
--- music/Makefile.am
+++ music/Makefile.am
@@ -3,10 +3,10 @@
 SHELL=@SHELL@
 
 install-data-am:
-	$(SHELL) ./../mkinstalldirs $(datadir)/xlogical
-	$(SHELL) ./../mkinstalldirs $(datadir)/xlogical/music
-	cp *.mod $(datadir)/xlogical/music
-	chmod 644 $(datadir)/xlogical/music/*.mod
+	$(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical
+	$(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical/music
+	cp *.mod $(DESTDIR)$(datadir)/xlogical/music
+	chmod 644 $(DESTDIR)$(datadir)/xlogical/music/*.mod
 uninstall:
 	rm -f $(datadir)/xlogical/music/*.mod
 	rmdir $(datadir)/xlogical/music
--- sound/Makefile.am
+++ sound/Makefile.am
@@ -3,10 +3,10 @@
 SHELL=@SHELL@
 
 install-data-am:
-	$(SHELL) ./../mkinstalldirs $(datadir)/xlogical
-	$(SHELL) ./../mkinstalldirs $(datadir)/xlogical/sound
-	cp *.wav $(datadir)/xlogical/sound
-	chmod 644 $(datadir)/xlogical/sound/*.wav
+	$(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical
+	$(SHELL) ./../mkinstalldirs $(DESTDIR)$(datadir)/xlogical/sound
+	cp *.wav $(DESTDIR)$(datadir)/xlogical/sound
+	chmod 644 $(DESTDIR)$(datadir)/xlogical/sound/*.wav
 uninstall:
 	rm -f $(datadir)/xlogical/sound/*.wav
 	rmdir $(datadir)/xlogical/sound

Places

File xlogical-1.0-7.dif of Package xlogical

Places