diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-04-01 09:34:24 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-04-01 09:34:24 +0000 |
| commit | 939e58d5794c36b8db488f5e572ec6685b2f2835 (patch) | |
| tree | aa3f5964d9e4f2ff9631bdb80517c9b19b6d77ab /debian/rules.d | |
| parent | 03477afe835ba93df64298a6c97ea864f59ad61e (diff) | |
| download | gcc-5-939e58d5794c36b8db488f5e572ec6685b2f2835.tar.gz | |
- remove use of cxx_incdir macro
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7941 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/rules.d')
| -rw-r--r-- | debian/rules.d/binary-java.mk | 4 | ||||
| -rw-r--r-- | debian/rules.d/binary-libstdcxx.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/rules.d/binary-java.mk b/debian/rules.d/binary-java.mk index 317fdb5..d64632a 100644 --- a/debian/rules.d/binary-java.mk +++ b/debian/rules.d/binary-java.mk @@ -187,8 +187,8 @@ dirs_jdev = \ $(jvm_dir)/include files_jdev = \ - $(cxx_inc_dir)/{org,gcj,java,javax} \ - $(cxx_inc_dir)/gnu/{awt,classpath,gcj,java,javax} \ + $(PF)/include/c++/$(BASE_VERSION)/{org,gcj,java,javax} \ + $(PF)/include/c++/$(BASE_VERSION)/gnu/{awt,classpath,gcj,java,javax} \ $(PF)/$(libdir)/pkgconfig/libgcj-$(BASE_VERSION).pc \ $(gcj_vlibdir)/lib*peer.so diff --git a/debian/rules.d/binary-libstdcxx.mk b/debian/rules.d/binary-libstdcxx.mk index 6c5cef7..a0a95ef 100644 --- a/debian/rules.d/binary-libstdcxx.mk +++ b/debian/rules.d/binary-libstdcxx.mk @@ -104,10 +104,10 @@ dirs_dev = \ $(docdir)/$(p_base)/C++ \ $(usr_lib) \ $(gcc_lib_dir)/include \ - $(cxx_inc_dir) + $(PF)/include/c++ files_dev = \ - $(cxx_inc_dir)/ \ + $(PF)/include/c++/$(BASE_VERSION) \ $(gcc_lib_dir)/libstdc++.{a,so} \ $(gcc_lib_dir)/libsupc++.a |