mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

46 lines
1.7 KiB

  1. diff -urN straw.orig/Makefile straw/Makefile
  2. --- straw.orig/Makefile 2003-11-25 11:22:22.000000000 +0100
  3. +++ straw/Makefile 2003-11-27 07:11:26.000000000 +0100
  4. @@ -1,4 +1,4 @@
  5. -PYTHON ?= python2.2
  6. +PYTHON ?= python2.3
  7. INSTALL ?= install
  8. RM ?= rm
  9. MSGFMT ?= msgfmt
  10. @@ -11,14 +11,14 @@
  11. PREFIX ?= `pkg-config libgnome-2.0 --variable=prefix || echo /usr/local`
  12. # If you edited PYTHON above, edit this to the corresponding python lib dir
  13. -LIBDIR = $(PREFIX)/lib/python2.2/site-packages/straw
  14. +LIBDIR = $(PREFIX)/lib/python2.3/site-packages/straw
  15. BINDIR = $(PREFIX)/bin
  16. DATADIR = $(PREFIX)/share/straw
  17. APPLICATIONSDIR = $(PREFIX)/share/applications
  18. ICONDIR = $(PREFIX)/share/pixmaps
  19. LOCALEDIR = $(PREFIX)/share/locale
  20. # change this to just "/etc" if you're installing in /usr
  21. -SYSCONFDIR = $(PREFIX)/etc
  22. +SYSCONFDIR = /etc/$(PREFIX)
  23. POFILES := $(shell echo po/*.po)
  24. MOFILES := $(POFILES:.po=.mo)
  25. @@ -27,8 +27,8 @@
  26. schema_DATA = data/straw.schemas
  27. # modify this if you're running your own build environment (garnome/jhbuild)
  28. # change it to "xml://path/to/gnome_build_env/etc/gconf/gconf.xml.defaults"
  29. -GCONF_SCHEMA_CONFIG_SOURCE = xml::/etc/gconf/gconf.xml.defaults
  30. -GCONF_SCHEMA_FILE_DIR = /etc/gconf/schemas/
  31. +GCONF_SCHEMA_CONFIG_SOURCE = xml::$(SYSCONFDIR)/gconf/gconf.xml.defaults
  32. +GCONF_SCHEMA_FILE_DIR = $(SYSCONFDIR)/gconf/schemas/
  33. GCONFTOOL = gconftool-2
  34. SCHEMADIR = $(GCONF_SCHEMA_FILE_DIR)
  35. diff -urN straw.orig/src/straw straw/src/straw
  36. --- straw.orig/src/straw 2002-09-12 01:15:49.000000000 +0200
  37. +++ straw/src/straw 2003-11-27 07:00:11.000000000 +0100
  38. @@ -1,4 +1,4 @@
  39. -#!/usr/bin/env python2.2
  40. +#!/usr/bin/env python
  41. #
  42. # Copyright (c) 2002 Juri Pakaste
  43. # You may use and distribute this software under the terms of the