Ticket #2889: patch-ivcommondefs.diff

File patch-ivcommondefs.diff, 1.5 KB (added by cssdev@…, 19 years ago)

Patch for ivcommondefs

  • make/ivcommondefs

    old new  
    103103ARFLAGS = vrs
    104104INSTALL = /usr/bin/install
    105105
    106 LCXXDEFS += $(MATHDEFS)
    107 LCDEFS += $(MATHDEFS)
     106# Don't use MATHDEFS with gcc 3.3+
     107#LCXXDEFS += $(MATHDEFS)
     108#LCDEFS += $(MATHDEFS)
    108109
    109110DARWINOPTS = -dynamic -fno-common
    110111LCXXOPTS += $(DARWINOPTS)
    111112LCOPTS += $(DARWINOPTS)
    112113
    113114X11DIR = /usr/X11R6
    114 X11INCDIR = $(X11DIR)/include
    115 X11LIBDIR = $(X11DIR)/lib
     115X11INCDIR = $(X11DIR)/include -I__PREFIX__/include
     116X11LIBDIR = $(X11DIR)/lib -L__PREFIX__/lib
    116117
    117118LCXXINCS += -I$(X11INCDIR)
    118119LCINCS += -I$(X11INCDIR) -I$(X11INCDIR)/freetype2
    … …  
    183184# Inventor install directories.
    184185#
    185186
    186 IVPREFIX = /usr
     187IVPREFIX = __PREFIX__
    187188LCXXOPTS += -DIVPREFIX=\"$(IVPREFIX)\"
    188189LCOPTS += -DIVPREFIX=\"$(IVPREFIX)\"
    189190
    … …  
    192193IVDLIBDIR = $(IVLIBDIR)/InventorDebug
    193194IVHDRTOP = $(IVROOT)/$(IVPREFIX)/include/Inventor
    194195IVHDRDIR = $(IVHDRTOP)/$(HDRSUBDIR)
    195 IVMAN1DIR = $(IVROOT)/$(IVPREFIX)/man/man1
    196 IVMAN3DIR = $(IVROOT)/$(IVPREFIX)/man/man3
    197 IVHELPDIR = $(IVROOT)/$(IVPREFIX)/share/help
    198 IVDATADIR = $(IVROOT)/$(IVPREFIX)/share/data/models
    199 IVDEMODIR = $(IVROOT)/$(IVPREFIX)/demos
     196IVMAN1DIR = $(IVROOT)/$(IVPREFIX)/share/man/man1
     197IVMAN3DIR = $(IVROOT)/$(IVPREFIX)/share/man/man3
     198IVHELPDIR = $(IVROOT)/$(IVPREFIX)/share/inventor/help
     199IVDATADIR = $(IVROOT)/$(IVPREFIX)/share/inventor/data/models
     200IVDEMODIR = $(IVROOT)/$(IVPREFIX)/share/inventor/demos
    200201IVDEMOBINDIR = $(IVDEMODIR)/Inventor
    201202IVDEMODATADIR = $(IVDEMODIR)/data/Inventor
    202203