Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install the config files for cross debs under /usr/$(host), but link them

Browse Source 
to the default system location under /usr.  This way the commands:
wx-config --prefix=/usr/$(host) and wx-config --prefix=/usr --host=$(host)
are much more congruent in their action.

Another nail in the coffin for inplace hacks.  Link $srcdir/include to
the build dir so that --prefix=$build_dir really does point to a
realistic looking installed development environment.  I don't know why
I didn't do this instead of (ab)using --exec-prefix to 'fix' this
simple omission for so long.  Probably because it is much more obvious
if contrib is out of the picture.  That makes it a little more work
right now, but long term this is a very clean and correct thing to do.
It completely absolves us of the two independent variables problem,
and of the tree becoming bogus without actually being stale.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2004-09-22 20:29:51 +00:00
parent 589e20d03c
commit 9103d280f9
5 changed files with 212 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
debian/rules vendored
View File

@@ -633,12 +633,23 @@ install-msw-dev: build-msw-shared-stamp build-msw-static-stamp
dh_installdirs
dh_install $(objdir_msw_shared)/lib/*.dll* usr/$(cross_host)/lib
dh_install $(objdir_msw_shared)/lib/wx/include usr/$(cross_host)/lib/wx
dh_install $(objdir_msw_shared)/lib/wx/config/$(cross_host)* usr/lib/wx/config
dh_install $(objdir_msw_shared)/lib/wx/config/$(cross_host)* usr/$(cross_host)/lib/wx/config
dh_install $(objdir_msw_static)/lib/*.a usr/$(cross_host)/lib
dh_install $(objdir_msw_static)/lib/wx/include usr/$(cross_host)/lib/wx
dh_install $(objdir_msw_static)/lib/wx/config/$(cross_host)* usr/lib/wx/config
dh_install $(objdir_msw_static)/lib/wx/config/$(cross_host)* usr/$(cross_host)/lib/wx/config
$(cross_host)-strip --strip-debug debian/$(package_msw_dev)/usr/$(cross_host)/lib/*.a
@# As a special case for the cross packages, we link their config
@# under /usr as well as under the normal cross prefix. This way
@# --prefix=/usr/$(cross_host) and --prefix=/usr --host=$(cross_host)
@# will have a congruent effect on wx-config.
@( for f in `ls -1 debian/$(package_msw_dev)/usr/$(cross_host)/lib/wx/config`; do \
all_cfg="$${all_cfg} usr/$(cross_host)/lib/wx/config/$$f usr/lib/wx/config/$$f"; \
echo "linking cross config /usr/$(cross_host)/lib/wx/config/$$f"; \
done; \
dh_link $${all_cfg}; \
)
install-msw-dbg: DH_OPTIONS=-p$(package_msw_dbg)
install-msw-dbg: build-msw-dbg-stamp
dh_testdir
@@ -647,10 +658,17 @@ install-msw-dbg: build-msw-dbg-stamp
dh_installdirs
dh_install $(objdir_msw_dbg)/lib/*.dll* usr/$(cross_host)/lib
dh_install $(objdir_msw_dbg)/lib/wx/include usr/$(cross_host)/lib/wx
dh_install $(objdir_msw_dbg)/lib/wx/config/$(cross_host)* usr/lib/wx/config
dh_install $(objdir_msw_dbg)/lib/wx/config/$(cross_host)* usr/$(cross_host)/lib/wx/config
# No static lib, they're freakin' huge!
#$(cross_host)-strip --strip-debug debian/$(package_msw_dbg)/usr/$(cross_host)/lib/*.a
@( for f in `ls -1 debian/$(package_msw_dbg)/usr/$(cross_host)/lib/wx/config`; do \
all_cfg="$${all_cfg} usr/$(cross_host)/lib/wx/config/$$f usr/lib/wx/config/$$f"; \
echo "linking cross config /usr/$(cross_host)/lib/wx/config/$$f"; \
done; \
dh_link $${all_cfg}; \
)
install-headers-msw: DH_OPTIONS=-p$(package_headers_msw)
install-headers-msw:
dh_testdir
@@ -665,7 +683,7 @@ install-headers-msw:
@# Symlink all the headers that will be installed by the main -headers
@# package to where the cross compiler will expect them.
@( for f in `ls -1 include/wx`; do \
all_h="$${all_h} /usr/include/wx-$(release)/wx/$$f usr/$(cross_host)/include/wx-$(release)/wx/$$f"; \
all_h="$${all_h} usr/include/wx-$(release)/wx/$$f usr/$(cross_host)/include/wx-$(release)/wx/$$f"; \
echo "linking header /usr/include/wx-$(release)/wx/$$f"; \
done; \
dh_link $${all_h}; \