Hi.

Here's a patch to handle fltk-config.

I don't use cmake, so would like to not touch FLTK-Targets-none.cmake.
Can you do that?

Thanks

>From b6c84bc2864913c48eb4db54bf4f75d62759770c Mon Sep 17 00:00:00 2001
From: Dima Kogan <dko...@debian.org>
Date: Fri, 24 Dec 2021 14:38:48 -0800
Subject: [PATCH] "fltk-config" no longer has arch-specific data in it

The arch-specific stuff is in "ARCH-fltk-config", with "fltk-config" calling the
appropriate one. This is a step on the way towards making libfltk1.3-dev
Multi-Arch:same
---
 debian/fltk-config            |  2 ++
 debian/libfltk1.3-dev.install |  3 ++-
 debian/rules                  | 14 ++++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100755 debian/fltk-config

diff --git a/debian/fltk-config b/debian/fltk-config
new file mode 100755
index 0000000..4990298
--- /dev/null
+++ b/debian/fltk-config
@@ -0,0 +1,2 @@
+#!/bin/sh
+`dpkg-architecture -q DEB_HOST_GNU_TYPE`-fltk-config
diff --git a/debian/libfltk1.3-dev.install b/debian/libfltk1.3-dev.install
index cf160d9..78cbc47 100644
--- a/debian/libfltk1.3-dev.install
+++ b/debian/libfltk1.3-dev.install
@@ -1,4 +1,5 @@
-usr/bin/fltk-config
+usr/bin/*-fltk-config
+debian/fltk-config /usr/bin
 usr/include/FL/*.H
 usr/include/FL/abi-version.h
 usr/include/FL/dirent.h
diff --git a/debian/rules b/debian/rules
index e842252..a5f702e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,9 +96,10 @@ override_dh_auto_install-arch:
 ## libfltk1.3-dev
 	cp debian/CMakeCache.txt CMakeTmp/etc/*.cmake \
 	    CMake/FLTK-Functions.cmake debian/tmp/usr/lib/fltk
-	sed -e 's/ -f[a-z]*-prefix-map=[^ ]*//' fltk-config \
-	    > debian/tmp/usr/bin/fltk-config
-	chmod +x debian/tmp/usr/bin/fltk-config
+	sed -e 's/ -f[a-z]*-prefix-map=[^ ]*//' debian/tmp/usr/bin/fltk-config \
+	    > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-fltk-config
+	chmod 755 debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-fltk-config
+	rm debian/tmp/usr/bin/fltk-config
 
 ifeq "" "$(filter nodoc,$(DEB_BUILD_OPTIONS))"
   override_dh_auto_install-indep:
@@ -107,9 +108,10 @@ endif
 
 override_dh_install-arch:
 ## libfltk1.3-dev
-	sed -e 's/ -f[a-z]*-prefix-map=[^ ]*//' fltk-config \
-	    > debian/tmp/usr/bin/fltk-config
-	chmod +x debian/tmp/usr/bin/fltk-config
+	sed -e 's/ -f[a-z]*-prefix-map=[^ ]*//' debian/tmp/usr/bin/fltk-config \
+	    > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-fltk-config
+	chmod 755 debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-fltk-config
+	rm debian/tmp/usr/bin/fltk-config
 	dh_install
 
 override_dh_installdocs:
-- 
2.30.1

Reply via email to