Changeset 319


Ignore:
Timestamp:
08/06/09 00:03:07 (3 years ago)
Author:
marc
Message:

Better prefix for installation

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/release/0.2/Makefile

    r317 r319  
    11INSTALL ?= install 
    22RM ?= rm 
    3 MSGFMT ?= msgfmt 
    4 MSGMERGE ?= msgmerge 
    5 XGETTEXT ?= xgettext 
    63FIND ?= find 
    74 
    85PREFIX = /usr/local 
    9 # When debian builds it, it passes its own DESTDIR 
    10 DESTDIR = $(PREFIX) 
     6# This is for debian 
     7REAL_PREFIX = $(PREFIX) 
    118 
    12 LIBDIR = $(DESTDIR)/lib/itaka 
    13 BINDIR = $(DESTDIR)/bin 
    14 DATADIR = $(DESTDIR)/share/itaka 
     9LIBDIR = $(PREFIX)/lib/itaka 
     10BINDIR = $(PREFIX)/bin 
     11DATADIR = $(PREFIX)/share/itaka 
    1512IMAGESDIR = $(DATADIR)/images 
    16 APPLICATIONSDIR = $(DESTDIR)/share/applications 
    17 ICONDIR = $(DESTDIR)/share/pixmaps 
    18 MANDIR = $(DESTDIR)/share/man/man1 
     13APPLICATIONSDIR = $(PREFIX)/share/applications 
     14ICONDIR = $(PREFIX)/share/pixmaps 
     15MANDIR = $(PREFIX)/share/man/man1 
    1916 
    2017# For debian compatibility, these are hardcoded 
    21 REPLACEIMAGESDIR = $(PREFIX)/share/itaka/images/ 
     18REPLACEIMAGESDIR = $(REAL_PREFIX)/share/itaka/images/ 
    2219 
    2320PYFILES := $(shell $(FIND) . -name "*.py" -print) 

  • branches/release/0.2/debian/rules

    r316 r319  
    4444 
    4545        # Add here commands to install the package into debian/itaka. 
    46         $(MAKE) DESTDIR=$(CURDIR)/debian/itaka/usr install 
     46        $(MAKE) REAL_PREFIX=/usr PREFIX=$(CURDIR)/debian/itaka/usr install 
    4747 
    4848        # And other miscellaneous tasks 

  • trunk/Makefile

    r317 r319  
    77 
    88PREFIX = /usr/local 
    9 # When debian builds it, it passes its own DESTDIR 
    10 DESTDIR = $(PREFIX) 
     9# This is for debian 
     10REAL_PREFIX = $(PREFIX) 
    1111 
    12 LIBDIR = $(DESTDIR)/lib/itaka 
    13 BINDIR = $(DESTDIR)/bin 
    14 DATADIR = $(DESTDIR)/share/itaka 
     12LIBDIR = $(PREFIX)/lib/itaka 
     13BINDIR = $(PREFIX)/bin 
     14DATADIR = $(PREFIX)/share/itaka 
    1515IMAGESDIR = $(DATADIR)/images 
    1616LOCALEDIR = $(DATADIR)/locale 
    17 APPLICATIONSDIR = $(DESTDIR)/share/applications 
    18 ICONDIR = $(DESTDIR)/share/pixmaps 
    19 MANDIR = $(DESTDIR)/share/man/man1 
     17APPLICATIONSDIR = $(PREFIX)/share/applications 
     18ICONDIR = $(PREFIX)/share/pixmaps 
     19MANDIR = $(PREFIX)/share/man/man1 
    2020 
    2121# For debian compatibility, these are hardcoded 
    22 REPLACEIMAGESDIR = $(PREFIX)/share/itaka/images/ 
    23 REPLACELOCALEDIR = $(PREFIX)/share/itaka/locale/ 
     22REPLACEIMAGESDIR = $(REAL_PREFIX)/share/itaka/images/ 
     23REPLACELOCALEDIR = $(REAL_PREFIX)/share/itaka/locale/ 
     24 
    2425 
    2526PYFILES := $(shell $(FIND) . -name "*.py" -print) 

  • trunk/debian/rules

    r316 r319  
    4545 
    4646        # Add here commands to install the package into debian/itaka. 
    47         $(MAKE) DESTDIR=$(CURDIR)/debian/itaka/usr install 
     47        $(MAKE) REAL_PREFIX=/usr PREFIX=$(CURDIR)/debian/itaka/usr install 
    4848 
    4949        # And other miscellaneous tasks 
Note: See TracChangeset for help on using the changeset viewer.