Ticket #17680: patch-Makefile.diff

File patch-Makefile.diff, 1.4 KB (added by richard@…, 16 years ago)

Makefile patch - issue regarding destdir

  • Makefile

     
    1212        cd src && $(MAKE) REACTOR=..
    1313
    1414SHELL           = /bin/sh
    15 DEST            = /usr/local
    16 CONFIG_DEST     = $(DEST)/include
     15DESTDIR         = /usr/local
     16INCL_DEST       = $(DESTDIR)/include
     17DOC_DEST        = $(DESTDIR)/share/doc
     18LIB_DEST        = $(DESTDIR)/lib
    1719
    1820clean: 
    1921        @-echo 'Making clean...'
     
    2325install: install-headers install-libs
    2426
    2527install-headers:
    26         @-echo "installing into $(DEST)/include/svl $(DEST)/doc"
     28        @-echo "installing into $(INCL_DEST)/svl $(DOC_DEST)"
    2729        @-chmod a+r include/svl/* doc/*
    2830        @-umask 022 \
    29                 && mkdir -p $(DEST)/doc $(DEST)/include/svl
     31                && mkdir -p $(DOC_DEST) $(INCL_DEST)/svl
    3032        @-umask 022 \
    31             && cp doc/* $(DEST)/doc \
    32             && cp include/svl/* $(DEST)/include/svl
     33            && cp doc/* $(DOC_DEST) \
     34            && cp include/svl/* $(INCL_DEST)/svl
    3335        @-echo "done."
    3436
    3537install-libs:
    36         @-echo "installing into $(DEST)/lib $(CONFIG_DEST)"
     38        @-echo "installing into $(LIB_DEST) $(INCL_DEST)"
    3739        @-chmod a+r lib/* include/SVLConfig.h
    3840        @-umask 022 \
    39                 && mkdir -p $(DEST)/lib $(CONFIG_DEST)
     41                && mkdir -p $(LIB_DEST) $(INCL_DEST)
    4042        @-umask 022 \
    41                 && cp lib/* $(DEST)/lib \
    42                 && cp include/SVLConfig.h $(CONFIG_DEST)
     43                && cp lib/* $(LIB_DEST) \
     44                && cp include/SVLConfig.h $(INCL_DEST)
    4345        @-echo "done."
    4446
    4547# setup for multi-architecture build in afs.