[llvm-commits] CVS: llvm/tools/llvm-config/llvm-config.in.in

[Chris Lattner]

Changes in directory llvm/tools/llvm-config:

llvm-config.in.in updated: 1.6 -> 1.7
---
Log message:

Remove some variables from the configured section that aren't.


---
Diffs of the changes:  (+6 -9)

 llvm-config.in.in |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)


Index: llvm/tools/llvm-config/llvm-config.in.in
diff -u llvm/tools/llvm-config/llvm-config.in.in:1.6 llvm/tools/llvm-config/llvm-config.in.in:1.7
--- llvm/tools/llvm-config/llvm-config.in.in:1.6	Thu Jun  1 19:56:15 2006
+++ llvm/tools/llvm-config/llvm-config.in.in	Thu Jun  1 20:04:35 2006
@@ -17,9 +17,6 @@
 #---- begin autoconf values ----
 my $VERSION             = q{@PACKAGE_VERSION@};
 my $PREFIX              = q{@LLVM_PREFIX@};
-my $BINDIR              = "$PREFIX/bin";
-my $INCLUDEDIR          = "$PREFIX/include";
-my $LIBDIR              = "$PREFIX/lib";
 my $ARCH                = lc(q{@ARCH@});
 my $TARGET_HAS_JIT      = q{@TARGET_HAS_JIT@};
 my @TARGETS_BUILT       = map { lc($_) } qw{@TARGETS_TO_BUILD@};
@@ -49,15 +46,15 @@
         } elsif ($arg eq "--prefix") {
             $has_opt = 1; print "$PREFIX\n";
         } elsif ($arg eq "--bindir") {
-            $has_opt = 1; print "$BINDIR\n";
+            $has_opt = 1; print "$PREFIX/bin\n";
         } elsif ($arg eq "--includedir") {
-            $has_opt = 1; print "$INCLUDEDIR\n";
+            $has_opt = 1; print "$PREFIX/include\n";
         } elsif ($arg eq "--libdir") {
-            $has_opt = 1; print "$LIBDIR\n";
+            $has_opt = 1; print "$PREFIX/lib\n";
         } elsif ($arg eq "--cxxflags") {
-            $has_opt = 1; print "-I$INCLUDEDIR $CXXFLAGS\n";
+            $has_opt = 1; print "-I$PREFIX/include $CXXFLAGS\n";
         } elsif ($arg eq "--ldflags") {
-            $has_opt = 1; print "-L$LIBDIR $LDFLAGS\n";
+            $has_opt = 1; print "-L$PREFIX/lib $LDFLAGS\n";
         } elsif ($arg eq "--libs") {
             $has_opt = 1; $want_libs = 1;
         } elsif ($arg eq "--libnames") {
@@ -140,7 +137,7 @@
         if (defined $basename) {
             push @result, "-l$basename";
         } else {
-            push @result, "$LIBDIR/$lib";
+            push @result, "$PREFIX/lib/$lib";
         }
     }
     return @result;