Changeset 169

Timestamp:

06/17/07 21:43:40 (17 months ago)

Author:

zany

Message:

swig conf cleanup

Location:

trunk/swig

Files:

• perl/Makefile.PL.in (modified) (1 diff)
• ruby/extconf.rb (modified) (1 diff)

trunk/swig/perl/Makefile.PL.in

@@ -13 +13 @@
 # but we want rpath to be @libdir@ or @exec_prefix@/lib
     'LDDLFLAGS' =>      q[-shared -Wl,-rpath=@prefix@/lib],
-    'LIBS'      =>      q[-L@top_builddir@obexftp/.libs -lobexftp
-                          -L@top_builddir@multicobex/.libs -lmulticobex
-                          -L@top_builddir@bfb/.libs -lbfb
+    'LIBS'      =>      q[-L@top_builddir@/obexftp/.libs -lobexftp
+                          -L@top_builddir@/multicobex/.libs -lmulticobex
+                          -L@top_builddir@/bfb/.libs -lbfb
                           @OPENOBEX_LIBS@ @BLUETOOTH_LIBS@ @LIBS@],
     'OBJECT'    =>      'perl_wrap.o', # $(OBJ_EXT)

trunk/swig/ruby/extconf.rb

@@ -16 +16 @@
 if ENV['PREFIX']
   prefix = CONFIG['prefix']
-  CONFIG.each do |key, var|
-    CONFIG[key] = var.sub(/#{prefix}/, ENV['PREFIX'])
+  %w[ prefix sitedir datadir infodir mandir oldincludedir ].each do |key|
+    CONFIG[key] = CONFIG[key].sub(/#{prefix}/, ENV['PREFIX'])
   end
 end