Show
Ignore:
Timestamp:
05/31/07 22:54:44 (2 years ago)
Author:
dsmith
Message:

Create dev branch (currently contains experimental python plugins)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/dev/common/include/app.mak

    r52 r118  
    66INST_DIR ?= /usr/local/bin 
    77 
    8 DEST_INST_DIR = $(DESTDIR)/$(INST_DIR) 
     8DEST_INST_DIR = $(ROOTDIR)$(INST_DIR) 
    99 
    1010all: $(APP_NAME) 

  • branches/dev/common/include/lib.mak.in

    r52 r118  
    88SO_NAME    = $(LINK_NAME).$(MAJOR_VER) 
    99SHARED_LIB = $(SO_NAME).$(MINOR_VER) 
    10 DEST_INC_INST_DIR = $(DESTDIR)/$(INC_INST_DIR) 
    11 DEST_LIB_INST_DIR = $(DESTDIR)/$(LIB_INST_DIR) 
     10DEST_INC_INST_DIR = $(ROOTDIR)$(INC_INST_DIR) 
     11DEST_LIB_INST_DIR = $(ROOTDIR)$(LIB_INST_DIR) 
    1212 
    1313OBJECTS = $(SOURCES:.c=.o) 

  • branches/dev/common/include/plugin.mak

    r52 r118  
    88CFLAGS += -fpic 
    99 
    10 #TODO:unify the way DESTDIR is handled 
    11 #Currently, defs.mak adds DESTDIR to the plugin INST_DIR, 
     10#TODO:unify the way ROOTDIR is handled 
     11#Currently, defs.mak adds ROOTDIR to the plugin INST_DIR, 
    1212#so we don't do it here 
    13 #DEST_INST_DIR = $(DESTDIR)/$(INST_DIR) 
     13#DEST_INST_DIR = $(ROOTDIR)/$(INST_DIR) 
    1414DEST_INST_DIR = $(INST_DIR) 
    1515