r6439 - in packages/trunk/sdlbasic/debian: . patches
Miriam Ruiz
baby-guest at alioth.debian.org
Fri Apr 4 15:01:22 UTC 2008
Author: baby-guest
Date: 2008-04-04 15:01:22 +0000 (Fri, 04 Apr 2008)
New Revision: 6439
Modified:
packages/trunk/sdlbasic/debian/patches/makefiles.patch
packages/trunk/sdlbasic/debian/rules
Log:
Install binaries in the proper directory
Modified: packages/trunk/sdlbasic/debian/patches/makefiles.patch
===================================================================
--- packages/trunk/sdlbasic/debian/patches/makefiles.patch 2008-04-04 14:26:52 UTC (rev 6438)
+++ packages/trunk/sdlbasic/debian/patches/makefiles.patch 2008-04-04 15:01:22 UTC (rev 6439)
@@ -3,8 +3,8 @@
Index: sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBasic/gtk/makefile
===================================================================
---- sdlbasic-0.0.20070714.orig/src/sdlBasic/src/sdlBasic/gtk/makefile 2008-04-04 14:18:43.000000000 +0000
-+++ sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBasic/gtk/makefile 2008-04-04 14:19:30.000000000 +0000
+--- sdlbasic-0.0.20070714.orig/src/sdlBasic/src/sdlBasic/gtk/makefile 2008-04-04 14:51:15.000000000 +0000
++++ sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBasic/gtk/makefile 2008-04-04 14:53:30.000000000 +0000
@@ -96,25 +96,26 @@
# This is OK - just means no SciTE in the Gnome Applications menu
# Dead: install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties
@@ -12,13 +12,13 @@
- $(INSTALL) -m 755 -d $(bindir) $(SYSCONF_PATH)
- $(INSTALL) -m 755 -d $(bindir) $(DOC_PATH)
- $(INSTALL) -m 755 -d $(bindir) $(PLUGINS_PATH)
-+ $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
-+ $(INSTALL) -m 755 -d $(DESTDIR)$(SYSCONF_PATH)
-+ $(INSTALL) -m 755 -d $(DESTDIR)$(DOC_PATH)
-+ $(INSTALL) -m 755 -d $(DESTDIR)$(PLUGINS_PATH)
++ $(INSTALL) -m 755 -d "$(DESTDIR)$(bindir)"
++ $(INSTALL) -m 755 -d "$(DESTDIR)$(SYSCONF_PATH)"
++ $(INSTALL) -m 755 -d "$(DESTDIR)$(DOC_PATH)"
++ $(INSTALL) -m 755 -d "$(DESTDIR)$(PLUGINS_PATH)"
- $(INSTALL) -m 755 $(PROG) $(bindir)
-+ $(INSTALL) -m 755 $(PROG) $(DESTDIR)$$(bindir)
++ $(INSTALL) -m 755 $(PROG) "$(DESTDIR)$(bindir)"
for files in ../../../share/sdlBasic/*.properties ../../../share/sdlBasic/*.api; \
do \
@@ -29,7 +29,7 @@
#for files in ..../share/doc/sdlBasic/*.html ../doc/SciTEIco.png ../doc/PrintHi.png; \
#do \
-#$(INSTALL) -m 644 $$files $(DOC_PATH); \
-+#$(INSTALL) -m 644 $$files $(DESTDIR)$$(DOC_PATH); \
++#$(INSTALL) -m 644 $$files "$(DESTDIR)$(DOC_PATH)"; \
#done
for files in ../../../share/sdlBasic/plugins/*.sdlbas; \
@@ -41,37 +41,169 @@
uninstall:
Index: sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/makefile
===================================================================
---- sdlbasic-0.0.20070714.orig/src/sdlBasic/src/sdlBrt/makefile 2008-04-04 14:18:43.000000000 +0000
-+++ sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/makefile 2008-04-04 14:19:03.000000000 +0000
+--- sdlbasic-0.0.20070714.orig/src/sdlBasic/src/sdlBrt/makefile 2008-04-04 14:51:15.000000000 +0000
++++ sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/makefile 2008-04-04 14:58:48.000000000 +0000
@@ -328,23 +328,23 @@
ifeq ($(compress), UPX)
upx -9 $(TARGET)
endif
- $(INSTALL) -c -m 755 -d ${exec_prefix}
- $(INSTALL) -c $(TARGET) ${exec_prefix}
-+ $(INSTALL) -c -m 755 -d $(DESTDIR)${exec_prefix}
-+ $(INSTALL) -c $(TARGET) $(DESTDIR)${exec_prefix}
++ $(INSTALL) -c -m 755 -d "$(DESTDIR)$(exec_prefix)"
++ $(INSTALL) -c $(TARGET) "$(DESTDIR)$(exec_prefix)"
install-fonts:
- $(INSTALL) -c -m 755 -d ${font_prefix}/dejavu
- $(INSTALL) fonts/DejaVuSans.ttf ${font_prefix}/dejavu/DejaVuSans.ttf
- $(INSTALL) fonts/DejaVuSansMono-Roman.ttf ${font_prefix}/dejavu/DejaVuSansMono-Roman.ttf
-+ $(INSTALL) -c -m 755 -d $(DESTDIR)${font_prefix}/dejavu
-+ $(INSTALL) fonts/DejaVuSans.ttf $(DESTDIR)${font_prefix}/dejavu/DejaVuSans.ttf
-+ $(INSTALL) fonts/DejaVuSansMono-Roman.ttf $(DESTDIR)${font_prefix}/dejavu/DejaVuSansMono-Roman.ttf
++ $(INSTALL) -c -m 755 -d "$(DESTDIR)$(font_prefix)"/dejavu
++ $(INSTALL) fonts/DejaVuSans.ttf "$(DESTDIR)$(font_prefix)"/dejavu/DejaVuSans.ttf
++ $(INSTALL) fonts/DejaVuSansMono-Roman.ttf "$(DESTDIR)$(font_prefix)"/dejavu/DejaVuSansMono-Roman.ttf
remove: remove-bin remove-fonts
remove-bin:
- $(RM) ${exec_prefix}/$(TARGET)
-+ $(RM) $(DESTDIR)${exec_prefix}/$(TARGET)
++ $(RM) "$(DESTDIR)$(exec_prefix)/$(TARGET)"
remove-fonts:
- $(RM) ${font_prefix}/dejavu/DejaVuSans.ttf
- $(RM) ${font_prefix}/dejavu/DejaVuSansMono-Roman.ttf
-+ $(RM) $(DESTDIR)${font_prefix}/dejavu/DejaVuSans.ttf
-+ $(RM) $(DESTDIR)${font_prefix}/dejavu/DejaVuSansMono-Roman.ttf
++ $(RM) "$(DESTDIR)$(font_prefix)"/dejavu/DejaVuSans.ttf
++ $(RM) "$(DESTDIR)$(font_prefix)"/dejavu/DejaVuSansMono-Roman.ttf
clean:
$(RM) *.o
+Index: sdlbasic-0.0.20070714/home/miriam/sb/sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBasic/gtk/makefile
+===================================================================
+--- sdlbasic-0.0.20070714.orig/home/miriam/sb/sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBasic/gtk/makefile 2008-04-04 14:51:31.000000000 +0000
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,127 +0,0 @@
+-# Make file for SciTE on Linux or compatible OS
+-# Copyright 1998-2002 by Neil Hodgson <neilh at scintilla.org>
+-# The License.txt file describes the conditions under which this software may be distributed.
+-# This makefile assumes GCC 2.95.2 is used and changes will be needed to use other compilers.
+-# GNU make does not like \r\n line endings so should be saved to CVS in binary form.
+-
+-.SUFFIXES: .cxx .o .h .a .c
+-CC = g++
+-AR = ar
+-
+-
+-# If explicit setting of GTK1 or GTK2 then use that else look for
+-# pkg-config which is an OK indication that GTK2 is available
+-ifndef GTK1
+-ifndef GTK2
+-ifneq (,$(findstring /,$(shell whereis pkg-config)))
+-GTK2=1
+-else
+-GTK1=1
+-endif
+-endif
+-endif
+-
+-# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
+-# "h at h@" is printed here when gnome-config unavailable. Seems harmless.
+-ifdef GTK2
+-CONFIGFLAGS=pkg-config --cflags gtk+-2.0
+-CONFIGLIB=pkg-config --libs gtk+-2.0 gthread-2.0
+-CONFIGTHREADS=
+-gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
+-else
+-CONFIGFLAGS=gtk-config --cflags
+-CONFIGLIB=gtk-config --libs
+-CONFIGTHREADS=glib-config --libs gthread
+-gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)
+-endif
+-ifndef prefix
+- prefix=/opt/sdlBasic
+-endif
+-datadir=$(prefix)/share
+-pixmapdir=$(datadir)/pixmaps
+-bindir=$(prefix)/bin
+-SYSCONF_PATH=$(prefix)/share/sdlBasic
+-DOC_PATH=$(prefix)/share/doc/sdlBasic
+-PLUGINS_PATH=$(prefix)/share/sdlBasic/plugins
+-
+-INSTALL=install -o root -g root
+-
+-PROG = ../../../bin/sdlBasic
+-
+-all: $(PROG)
+- strip $(PROG)
+-
+-vpath %.h ../src ../scintilla/include
+-vpath %.cxx ../src
+-
+-#CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
+-INCLUDEDIRS=-I ../scintilla/include -I ../src
+-CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
+-
+-ifdef DEBUG
+-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
+-else
+-CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
+-endif
+-
+-
+-CXXFLAGS=$(CXXTFLAGS) -DNO_LUA
+-
+-
+-ifeq ($(shell uname), Darwin)
+-CXXFLAGS:=$(CXXFLAGS) -Dunix
+-endif
+-
+-.cxx.o:
+- $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $< -o $@
+-
+-clean:
+- rm -f *.o $(PROG)
+-
+-deps:
+- $(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
+-
+-# make should be run in ../../scintilla/gtk to compile all the lexers.
+-COMPLIB=../scintilla/gtk/scintilla.a
+-
+-$(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
+-MultiplexExtension.o SciTEProps.o Utf8_16.o \
+- $(COMPLIB) $(LUA_OBJS)
+- $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ `$(CONFIGLIB)`
+-
+-# Automatically generate header dependencies with "make deps"
+-include deps.mak
+-
+-# The two last install commands will fail if Gnome is not installed or is not at $(prefix).
+-# This is OK - just means no SciTE in the Gnome Applications menu
+-# Dead: install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties
+-install:
+- $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+- $(INSTALL) -m 755 -d $(DESTDIR)$(SYSCONF_PATH)
+- $(INSTALL) -m 755 -d $(DESTDIR)$(DOC_PATH)
+- $(INSTALL) -m 755 -d $(DESTDIR)$(PLUGINS_PATH)
+-
+- $(INSTALL) -m 755 $(PROG) $(DESTDIR)$$(bindir)
+-
+- for files in ../../../share/sdlBasic/*.properties ../../../share/sdlBasic/*.api; \
+- do \
+- $(INSTALL) -m 644 $$files "$(DESTDIR)$(SYSCONF_PATH)"; \
+- done
+-
+-#for files in ..../share/doc/sdlBasic/*.html ../doc/SciTEIco.png ../doc/PrintHi.png; \
+-#do \
+-#$(INSTALL) -m 644 $$files $(DESTDIR)$$(DOC_PATH); \
+-#done
+-
+- for files in ../../../share/sdlBasic/plugins/*.sdlbas; \
+- do \
+- $(INSTALL) -m 644 $$files "$(DESTDIR)$(PLUGINS_PATH)"; \
+- done
+-
+-uninstall:
+- #rm -f $(DESTDIR)$(bindir)/SciTE
+- #rm -rf $(DESTDIR)$(SYSCONF_PATH)
+-#ifdef gnomeprefix
+- #rm -f $(DESTDIR)$(datadir)/gnome/apps/Applications/SciTE.desktop
+- #rm -f $(DESTDIR)$(pixmapdir)/Sci48M.png
+-#endif
Modified: packages/trunk/sdlbasic/debian/rules
===================================================================
--- packages/trunk/sdlbasic/debian/rules 2008-04-04 14:26:52 UTC (rev 6438)
+++ packages/trunk/sdlbasic/debian/rules 2008-04-04 15:01:22 UTC (rev 6439)
@@ -29,6 +29,7 @@
os=linux \
prefix="/usr" \
bindir="$(DESTBIN)" \
+ exec_prefix="$(DESTBIN)" \
datadir="$(DESTDATA)" \
font_prefix="/usr/share/fonts/truetype/ttf-dejavu" \
SYSCONF_PATH="$(DESTDATA)" \
@@ -68,8 +69,8 @@
dh_clean -k
dh_installdirs
- $(MAKE) -C $(ORIGSRC)/sdlBasic/gtk install DESTDIR="$(DESTDIR)" $(XFLAGS)
- $(MAKE) -C $(ORIGSRC)/sdlBrt $(XFLAGS) install DESTDIR="$(DESTDIR)" $(XFLAGS)
+ $(MAKE) -C $(ORIGSRC)/sdlBasic/gtk $(XFLAGS) install DESTDIR="$(DESTDIR)"
+ $(MAKE) -C $(ORIGSRC)/sdlBrt $(XFLAGS) install-bin DESTDIR="$(DESTDIR)"
mkdir -p "$(DESTDIR)$(DESTDOC)"
cp -r "$(ORIGDATA)"/doc/sdlBasic/* "$(DESTDIR)$(DESTDOC)"
More information about the Pkg-games-commits
mailing list