bjs/bjs-mkfix.diff

   1 --- bjs-0.1.3.orig//Makefile    2010-05-10 20:54:40.000000000 +0200
   2 +++ bjs-0.1.3//Makefile 2010-06-30 04:38:57.296514282 +0200
   3 @@ -1,5 +1,5 @@
   4
   5 -OPTIM_FLAGS = -O3 -ffast-math
   6 +#OPTIM_FLAGS = -O3 -ffast-math
   7  #OPTIM_FLAGS = -g3 -D_DEBUG
   8
   9
  10 @@ -18,16 +18,8 @@ CC              = gcc
  11  CXX             = g++
  12  #CFLAGS          = -Wall -Wextra -Wcast-align
  13
  14 -# It happens on some  platforms that the lua
  15 -# library is called lua and lua5.1 on others
  16 -# so we do this magic....
  17 -ifeq (`pkg-config --exists lua --print-errors`,"")
  18 -       LUACFLAGS = `pkg-config lua --cflags`
  19 -        LUALIBS   = `pkg-config lua --libs`
  20 -else
  21 -       LUACFLAGS = `pkg-config lua5.1 --cflags`
  22 -       LUALIBS   = `pkg-config lua5.1 --libs`
  23 -endif
  24 +LUACFLAGS = `pkg-config lua --cflags`
  25 +LUALIBS   = `pkg-config lua --libs`
  26
  27
  28  CFLAGS          = -Wall -Wcast-align `sdl-config --cflags` `freetype-config --cflags` -I./  -Wno-unknown-pragmas -DNO_SDL_GLEXT `pkg-config CEGUI-OPENGL --cflags` -Wno-deprecated $(LUACFLAGS)  -DdTRIMESH_ENABLED
  29 @@ -58,16 +50,16 @@ unique_test:
  30
  31
  32  $(TARGET_CLIENT): $(OBJECTFILES_CLIENT)
  33 -       $(CXX) $(OBJECTFILES_CLIENT) $(LIBS_CLIENT) $(CFLAGS) -o $@ $(OPTIM_FLAGS)
  34 +       $(CXX) $(OBJECTFILES_CLIENT) $(LIBS_CLIENT) $(CXXFLAGS) $(CFLAGS) -o $@
  35
  36  $(TARGET_SERVER): $(OBJECTFILES_SERVER)
  37 -       $(CXX) $(OBJECTFILES_SERVER) $(LIBS_SERVER) $(CFLAGS) -o $@ $(OPTIM_FLAGS)
  38 +       $(CXX) $(OBJECTFILES_SERVER) $(LIBS_SERVER) $(CXXFLAGS) $(CFLAGS) -o $@
  39
  40  %.o: %.cpp
  41 -       $(CXX) -c $< $(CFLAGS) -o $@ $(INCLUDES) $(OPTIM_FLAGS)
  42 +       $(CXX) -c $< $(CXXFLAGS) $(CFLAGS) -o $@ $(INCLUDES)
  43
  44  %.o: %.c
  45 -       $(CC) -c $< $(CFLAGS) -o $@ $(INCLUDES) $(OPTIM_FLAGS)
  46 +       $(CC) -c $< $(CXXFLAGS) $(CFLAGS) -o $@ $(INCLUDES)
  47
  48
  49  clean:
  50 @@ -82,21 +74,21 @@ depend:
  51
  52  #### Instalation - NOT WORKING!!!####
  53  install:
  54 -       mkdir -p '$(DESTDIR)/bin'
  55 -       mkdir -p '$(DESTDIR)/share/applications'
  56 -       mkdir -p '$(DESTDIR)/share/pixmaps'
  57 -       mkdir -p '$(DESTDIR)/share/man/man6'
  58 -       mkdir -p '$(DESTDIR)/share/$(DATADIR)/bjs/config'
  59 -       mkdir -p '$(DESTDIR)/share/$(DATADIR)/bjs/data'
  60 -       install -D -m755 bjs bjs_server '$(DESTDIR)/bin'
  61 -       install -D -m644 misc/bjs.desktop '$(DESTDIR)/share/applications'
  62 -       install -D -m644 misc/bjs.png     '$(DESTDIR)/share/pixmaps'
  63 -       install -D -m644 misc/bjs.6.gz    '$(DESTDIR)/share/man/man6'
  64 -       install -D -m644 config/*  '$(DESTDIR)/share/$(DATADIR)/bjs/config'
  65 -       cp -r data/* '$(DESTDIR)/share/$(DATADIR)/bjs/data'
  66 +       install -d '$(DESTDIR)/bin' || return 1
  67 +       install -d '$(DESTDIR)/share/applications' || return 1
  68 +       install -d '$(DESTDIR)/share/pixmaps' || return 1
  69 +       install -d '$(DESTDIR)/share/man/man6' || return 1
  70 +       install -d '$(DESTDIR)/share/bjs/config' || return 1
  71 +       install -d '$(DESTDIR)/share/bjs/data' || return 1
  72 +       install -D -m755 bjs bjs_server '$(DESTDIR)/bin' || return 1
  73 +       install -D -m644 misc/bjs.desktop '$(DESTDIR)/share/applications' || return 1
  74 +       install -D -m644 misc/bjs.png     '$(DESTDIR)/share/pixmaps' || return 1
  75 +       install -D -m644 misc/bjs.6.gz    '$(DESTDIR)/share/man/man6' || return 1
  76 +       install -D -m644 config/*  '$(DESTDIR)/share/bjs/config' || return 1
  77 +       cp -r data/* '$(DESTDIR)/share/bjs/data' || return 1
  78
  79  uninstall:
  80 -       rm -rf '$(DESTDIR)/share/$(DATADIR)/bjs'
  81 +       rm -rf '$(DESTDIR)/share/bjs'
  82         rm -f  '$(DESTDIR)/bin/bjs'
  83         rm -f  '$(DESTDIR)/bin/bjs_server'
  84         rm -f  '$(DESTDIR)/share/applications/bjs.desktop'