10000 TCL_CONFIG_DIR is not multi-arched yet on wheezy and precise · CartoDB/postgresql-debian@36fef55 · GitHub
[go: up one dir, main page]
Skip to content

Commit 36fef55

Browse files
df7cbdf7cb
committed
TCL_CONFIG_DIR is not multi-arched yet on wheezy and precise
This reverts cf4e81c partially.
1 parent 393769e commit 36fef55

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

‎debian/rules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,14 @@ endif
77
MAJOR_VER := 9.5
88

99
DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
10+
11+
# find tclconfig in multi-arch location (still in /usr/lib in wheezy and precise)
1012
DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
13+
ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(TCL_VER)),)
1114
TCL_CONFIG_DIR := /usr/lib/$(DEB_HOST_MULTIARCH)
15+
else
16+
TCL_CONFIG_DIR := /usr/lib
17+
endif
1218

1319
# support both hardening-wrapper (for backports) and dpkg-buildflags
1420
export DEB_BUILD_HARDENING = 1

0 commit comments

Comments
 (0)
0