Various build/install fixes. * "/usr/share/doc/blobAndConquerindex.html" is wrong :-) * need to create dirs for the desktop file and the associated icon * preserve timestamps when installing - could use -a, but we probably don't want to preserve ownership info - should probably use install? * 'clean' target should delete the executable --- blobandconquer-0.90.orig/makefile +++ blobandconquer-0.90/makefile @@ -19,7 +19,7 @@ LOCALEDIR = $(PREFIX)/share/locale/ CXXFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV) -CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall -pedantic +CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DGAMEPLAYMANUAL=\"$(DOCDIR)/index.html\" -Wall -pedantic CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\" LIBPATH = -L/usr/X11/lib -L/usr/X11R6/lib LIBS = -lGL -lGLU `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz @@ -89,19 +89,21 @@ mkdir -p $(BINDIR) mkdir -p $(DATADIR) mkdir -p $(DOCDIR) + mkdir -p $(ICONDIR) + mkdir -p $(MENUDIR) - cp $(PROG) $(BINDIR)/$(PROG) + cp --preserve=timestamps $(PROG) $(BINDIR)/$(PROG) - cp -R data $(DATADIR) - cp -R gfx $(DATADIR) - cp -R music $(DATADIR) - cp -R sound $(DATADIR) - cp -R textures $(DATADIR) + cp -R --preserve=timestamps data $(DATADIR) + cp -R --preserve=timestamps gfx $(DATADIR) + cp -R --preserve=timestamps music $(DATADIR) + cp -R --preserve=timestamps sound $(DATADIR) + cp -R --preserve=timestamps textures $(DATADIR) - cp -R doc $(DOCDIR) + cp -R --preserve=timestamps doc/* $(DOCDIR) - cp icons/blobAndConquer.png $(ICONDIR) - cp icons/blobAndConquer.desktop $(MENUDIR) + cp --preserve=timestamps icons/blobAndConquer.png $(ICONDIR) + cp --preserve=timestamps icons/blobAndConquer.desktop $(MENUDIR) @for f in $(LOCALE_MO); do \ lang=`echo $$f | sed -e 's/^locale\///;s/\.mo$$//'`; \ @@ -126,4 +128,4 @@ # cleaning everything that can be automatically recreated with "make". clean: - $(RM) $(OBJS) $(PAK).o main.o + $(RM) $(OBJS) $(PAK).o main.o $(PROG)