--- ray/src/px/SConscript 2005/09/12 14:44:09 1.12 +++ ray/src/px/SConscript 2005/09/17 07:45:11 1.14 @@ -66,13 +66,13 @@ if os.name == 'posix': [('cd "%(tiffdir)s"; ' 'env CC="$CC" ' './configure -C '#-with-CC="$CC" ' - '"libdir=%(upperdir)s/lib" "includedir=%(upperdir)s/common" ' + '"libdir=%(upperdir)s/lib" ' '--enable-static --disable-shared --disable-cxx ' '--enable-logluv --disable-jpeg ' '--disable-zlib --disable-pixarlog; ' - #'"-with-ENVOPTS=$CCFLAGS"; ' 'cd %(portdir)s; make all;' - 'cd %(libtiffdir)s; make install;') % { + 'cd %(libtiffdir)s; make install-exec;' # don't install headers + ) % { 'upperdir':upperdir, 'tiffdir':os.path.join(cwd, 'tiff'), 'portdir':os.path.join(cwd, 'tiff', 'port'), @@ -116,15 +116,15 @@ if env.has_key('X11LIB'): CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib) progs.append(xshowtrace) - if os.name == 'posix': # XXX ignoring trad.wsh - for s in Split('''normpat falsecolor pdfblur - pmblur xyzimage phisto pdelta pgblur ra_pfm'''): + for s in Split('''normpat falsecolor pdfblur pmblur pmdblur + xyzimage phisto pdelta pgblur ra_pfm ran2tiff'''): Default(env.InstallCsh(radbin(s), s + '.csh')) # XXX probably needs fixing #else: # for s in Split('''falsecolor'''): # Default(env.InstallCsh(radbin(s), s + '.csh')) +# ignored by Rmakefile: pacuity phisteq psquish pveil vlpic Default('#src/px') env.Install('$RAD_BINDIR', progs)