Changeset 8177

Show
Ignore:
Timestamp:
08/18/08 15:35:13 (5 years ago)
Author:
bhilburn
Message:

Moving to /usr/local/lib for RPMs.

Location:
ossiedev/trunk/system
Files:
6 removed
6 modified

Legend:

Unmodified
Added
Removed

  • ossiedev/trunk/system/ossie/idl/python/Makefile.am

    r8018 r8177  
    1010        mkdir -p $(DESTDIR)$(pythondir) 
    1111        cp -R ossie $(DESTDIR)$(pythondir) 
     12        cp ossie.pth /usr/lib/python2.5/site-packages/ 
    1213 
    1314distclean: 

  • ossiedev/trunk/system/ossie/idl/python/ossie.pth

    r8018 r8177  
    2222 
    2323# OSSIE tools 
    24 /sdr/tools 
    2524/usr/local/lib/python2.5/site-packages 

  • ossiedev/trunk/system/standardInterfaces-metadata/configure.ac

    r8089 r8177  
    1515AC_CHECK_HEADERS([omniORB4/CORBA.h], [], [AC_MSG_ERROR([cannot find omniORB4 header files])]) 
    1616AC_CHECK_PROG([IDL], [omniidl], [omniidl], [AC_MSG_ERROR([cannot find omniidl prgram])]) 
     17 
     18AM_PATH_PYTHON([2.5]) 
    1719 
    1820AC_LANG_POP 

  • ossiedev/trunk/system/standardInterfaces-metadata/python/Makefile

    r8175 r8177  
    3030PRE_UNINSTALL = : 
    3131POST_UNINSTALL = : 
    32 build_triplet = i686-pc-linux-gnu 
    33 host_triplet = i686-pc-linux-gnu 
     32build_triplet = x86_64-unknown-linux-gnu 
     33host_triplet = x86_64-unknown-linux-gnu 
    3434subdir = python 
    3535DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    … …  
    4343DIST_SOURCES = 
    4444DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 
    45 ACLOCAL = ${SHELL} /home/ssayed/ossiedev/trunk/system/standardInterfaces-metadata/missing --run aclocal-1.10 
    46 AMTAR = ${SHELL} /home/ssayed/ossiedev/trunk/system/standardInterfaces-metadata/missing --run tar 
     45ACLOCAL = ${SHELL} /home/bhilburn/working/ossiedev/trunk/system/standardInterfaces-metadata/missing --run aclocal-1.10 
     46AMTAR = ${SHELL} /home/bhilburn/working/ossiedev/trunk/system/standardInterfaces-metadata/missing --run tar 
    4747AR = ar 
    48 AUTOCONF = ${SHELL} /home/ssayed/ossiedev/trunk/system/standardInterfaces-metadata/missing --run autoconf 
    49 AUTOHEADER = ${SHELL} /home/ssayed/ossiedev/trunk/system/standardInterfaces-metadata/missing --run autoheader 
    50 AUTOMAKE = ${SHELL} /home/ssayed/ossiedev/trunk/system/standardInterfaces-metadata/missing --run automake-1.10 
     48AUTOCONF = ${SHELL} /home/bhilburn/working/ossiedev/trunk/system/standardInterfaces-metadata/missing --run autoconf 
     49AUTOHEADER = ${SHELL} /home/bhilburn/working/ossiedev/trunk/system/standardInterfaces-metadata/missing --run autoheader 
     50AUTOMAKE = ${SHELL} /home/bhilburn/working/ossiedev/trunk/system/standardInterfaces-metadata/missing --run automake-1.10 
    5151AWK = gawk 
    5252CC = gcc 
    … …  
    8484LN_S = ln -s 
    8585LTLIBOBJS =  
    86 MAKEINFO = ${SHELL} /home/ssayed/ossiedev/trunk/system/standardInterfaces-metadata/missing --run makeinfo 
     86MAKEINFO = ${SHELL} /home/bhilburn/working/ossiedev/trunk/system/standardInterfaces-metadata/missing --run makeinfo 
    8787MKDIR_P = /bin/mkdir -p 
    8888OBJEXT = o 
    … …  
    9797PATH_SEPARATOR = : 
    9898PKG_CONFIG = /usr/bin/pkg-config 
     99PYTHON = /usr/bin/python 
     100PYTHON_EXEC_PREFIX = ${exec_prefix} 
     101PYTHON_PLATFORM = linux2 
     102PYTHON_PREFIX = ${prefix} 
     103PYTHON_VERSION = 2.5 
    99104RANLIB = ranlib 
    100105SED = /bin/sed 
    … …  
    103108STRIP = strip 
    104109VERSION = 0.6.0 
    105 abs_builddir = /home/ssayed/ossiedev/trunk/system/standardInterfaces-metadata/python 
    106 abs_srcdir = /home/ssayed/ossiedev/trunk/system/standardInterfaces-metadata/python 
    107 abs_top_builddir = /home/ssayed/ossiedev/trunk/system/standardInterfaces-metadata 
    108 abs_top_srcdir = /home/ssayed/ossiedev/trunk/system/standardInterfaces-metadata 
     110abs_builddir = /home/bhilburn/working/ossiedev/trunk/system/standardInterfaces-metadata/python 
     111abs_srcdir = /home/bhilburn/working/ossiedev/trunk/system/standardInterfaces-metadata/python 
     112abs_top_builddir = /home/bhilburn/working/ossiedev/trunk/system/standardInterfaces-metadata 
     113abs_top_srcdir = /home/bhilburn/working/ossiedev/trunk/system/standardInterfaces-metadata 
    109114ac_ct_CC = gcc 
    110115ac_ct_CXX = g++ 
    … …  
    116121am__untar = ${AMTAR} xf - 
    117122bindir = ${exec_prefix}/bin 
    118 build = i686-pc-linux-gnu 
     123build = x86_64-unknown-linux-gnu 
    119124build_alias =  
    120 build_cpu = i686 
     125build_cpu = x86_64 
    121126build_os = linux-gnu 
    122 build_vendor = pc 
     127build_vendor = unknown 
    123128builddir = . 
    124129datadir = ${datarootdir} 
    … …  
    127132dvidir = ${docdir} 
    128133exec_prefix = ${prefix} 
    129 host = i686-pc-linux-gnu 
     134host = x86_64-unknown-linux-gnu 
    130135host_alias =  
    131 host_cpu = i686 
     136host_cpu = x86_64 
    132137host_os = linux-gnu 
    133 host_vendor = pc 
     138host_vendor = unknown 
    134139htmldir = ${docdir} 
    135140includedir = ${prefix}/include 
    136141infodir = ${datarootdir}/info 
    137 install_sh = $(SHELL) /home/ssayed/ossiedev/trunk/system/standardInterfaces-metadata/install-sh 
     142install_sh = $(SHELL) /home/bhilburn/working/ossiedev/trunk/system/standardInterfaces-metadata/install-sh 
    138143libdir = ${exec_prefix}/lib 
    139144libexecdir = ${exec_prefix}/libexec 
    … …  
    144149oldincludedir = /usr/include 
    145150pdfdir = ${docdir} 
     151pkgpyexecdir = ${pyexecdir}/standardinterfaces-metadata 
     152pkgpythondir = ${pythondir}/standardinterfaces-metadata 
    146153prefix = /usr/local 
    147154program_transform_name = s,x,x, 
    148155psdir = ${docdir} 
     156pyexecdir = ${exec_prefix}/lib64/python2.5/site-packages 
     157pythondir = ${prefix}/lib/python2.5/site-packages 
    149158sbindir = ${exec_prefix}/sbin 
    150159sharedstatedir = ${prefix}/com 
    … …  
    320329 
    321330all: 
    322         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../realChar.idl 
    323         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../realShort.idl 
    324         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../realLong.idl 
    325         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../realFloat.idl 
    326         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../realDouble.idl 
    327         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../complexShort.idl 
    328         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../complexFloat.idl 
    329         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../complexDouble.idl 
    330         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../complexChar.idl 
    331         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../complexLong.idl 
    332         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../Radio_Control.idl 
    333         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../FM_Control.idl 
    334         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../soundControl.idl 
    335         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../stereoSound.idl 
    336         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../sampleRateConvertorControl.idl 
     331        $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../realCharMD.idl 
     332        $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../complexShortMD.idl 
    337333 
    338334install-data-local: 

  • ossiedev/trunk/system/standardInterfaces-metadata/python/Makefile.in

    r8175 r8177  
    9797PATH_SEPARATOR = @PATH_SEPARATOR@ 
    9898PKG_CONFIG = @PKG_CONFIG@ 
     99PYTHON = @PYTHON@ 
     100PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 
     101PYTHON_PLATFORM = @PYTHON_PLATFORM@ 
     102PYTHON_PREFIX = @PYTHON_PREFIX@ 
     103PYTHON_VERSION = @PYTHON_VERSION@ 
    99104RANLIB = @RANLIB@ 
    100105SED = @SED@ 
    … …  
    144149oldincludedir = @oldincludedir@ 
    145150pdfdir = @pdfdir@ 
     151pkgpyexecdir = @pkgpyexecdir@ 
     152pkgpythondir = @pkgpythondir@ 
    146153prefix = @prefix@ 
    147154program_transform_name = @program_transform_name@ 
    148155psdir = @psdir@ 
     156pyexecdir = @pyexecdir@ 
     157pythondir = @pythondir@ 
    149158sbindir = @sbindir@ 
    150159sharedstatedir = @sharedstatedir@ 
    … …  
    320329 
    321330all: 
    322         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../realChar.idl 
    323         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../realShort.idl 
    324         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../realLong.idl 
    325         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../realFloat.idl 
    326         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../realDouble.idl 
    327         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../complexShort.idl 
    328         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../complexFloat.idl 
    329         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../complexDouble.idl 
    330         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../complexChar.idl 
    331         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../complexLong.idl 
    332         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../Radio_Control.idl 
    333         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../FM_Control.idl 
    334         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../soundControl.idl 
    335         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../stereoSound.idl 
    336         $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../sampleRateConvertorControl.idl 
     331        $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../realCharMD.idl 
     332        $(IDL_BIN) -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfacesMD -Wbinline ../complexShortMD.idl 
    337333 
    338334install-data-local: 

  • ossiedev/trunk/system/standardInterfaces/configure.ac

    r8175 r8177  
    1616AC_CHECK_PROG([IDL], [omniidl], [omniidl], [AC_MSG_ERROR([cannot find omniidl prgram])]) 
    1717 
    18 #AM_PATH_PYTHON([2.5]) 
     18AM_PATH_PYTHON([2.5]) 
    1919 
    2020AC_LANG_POP