summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2013-01-31 19:18:37 +0100
committerJose <jose@zeroc.com>2013-01-31 19:18:37 +0100
commit0010c79f40c7be482c75731893e40b1b57c040c0 (patch)
treea5fb4f54a35b968e24414f7edb12766619009af3 /cpp
parentXcode 4.6 - clang 4.2 updates (diff)
downloadice-0010c79f40c7be482c75731893e40b1b57c040c0.tar.bz2
ice-0010c79f40c7be482c75731893e40b1b57c040c0.tar.xz
ice-0010c79f40c7be482c75731893e40b1b57c040c0.zip
Minor fixes related to ICE-5193
Diffstat (limited to 'cpp')
-rw-r--r--cpp/bin/c++11/.gitignore1
-rw-r--r--cpp/config/Make.rules4
-rw-r--r--cpp/lib/c++11/.gitignore1
3 files changed, 2 insertions, 4 deletions
diff --git a/cpp/bin/c++11/.gitignore b/cpp/bin/c++11/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/cpp/bin/c++11/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 83c9b68191d..d9a94226f81 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -161,8 +161,8 @@ else
include $(top_srcdir)/../config/Make.common.rules
endif
-bindir = $(top_srcdir)/bin$(cpp11suffix)
-libdir = $(top_srcdir)/lib$(cpp11suffix)
+bindir = $(top_srcdir)/bin
+libdir = $(top_srcdir)/lib
headerdir = $(top_srcdir)/include
#
diff --git a/cpp/lib/c++11/.gitignore b/cpp/lib/c++11/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/cpp/lib/c++11/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.