Ignore:
Timestamp:
Nov 14, 2016 1:17:38 PM (6 years ago)
Author:
ldelgass
Message:

Merge selected nanoscale changes from trunk (by hand)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • nanoscale/branches/1.0/Makefile.in

    r6622 r6623  
     1WANT_TRACE      = #yes
    12
    23CC              = @CC@
     
    3334SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    3435
    35 DEFINES         = -DSERVERSFILE=\"$(libdir)/renderservers.tcl\" \
     36ifdef WANT_TRACE
     37DEFINES         = -DWANT_TRACE
     38endif
     39CONFIGFILE      = renderservers.tcl
     40DEFINES         += -DSERVERSFILE=\"$(libdir)/$(CONFIGFILE)\" \
    3641                -DSVN_VERSION=\"$(SVN_VERSION)\" \
    3742                -DLOGDIR=\"$(LOGDIR)\"
     
    4954        $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS)
    5055
    51 install: nanoscale renderservers.tcl start_nanoscale.sh
     56install: nanoscale $(CONFIGFILE) start_nanoscale.sh
    5257        $(INSTALL_PROGRAM) -D nanoscale $(bindir)/nanoscale
    5358        $(INSTALL_PROGRAM) start_nanoscale.sh $(bindir)/start_nanoscale.sh
    54         $(INSTALL_SCRIPT) renderservers.tcl $(libdir)
     59        $(INSTALL_DATA) $(CONFIGFILE) $(libdir)
    5560
    5661client: $(CLIENT_OBJS)
     
    6469distclean: clean
    6570        $(RM) -r autom4te.cache
    66         $(RM) Makefile config.cache config.log config.status config.h renderservers.tcl start_nanoscale.sh
     71        $(RM) Makefile config.cache config.log config.status config.h $(CONFIGFILE) start_nanoscale.sh
    6772
Note: See TracChangeset for help on using the changeset viewer.