diff options
Diffstat (limited to 'undebian.patch')
| -rw-r--r-- | undebian.patch | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/undebian.patch b/undebian.patch index 3b22b717ed62..ab34d6bd70f3 100644 --- a/undebian.patch +++ b/undebian.patch @@ -1,8 +1,14 @@ +commit 0a56bbe3d561ebabba6850edc79ae6cbdc3895a8 +Author: Thomas Hebb <tommyhebb@gmail.com> +Date: Sun Sep 8 22:14:22 2019 -0700 + + Remove Debian-specific bits from Makefiles + diff --git a/Common.mk b/Common.mk -index 83a4076f..e0cb81f0 100644 +index f16d4bdb..571373d2 100644 --- a/Common.mk +++ b/Common.mk -@@ -47,7 +47,6 @@ else +@@ -62,7 +62,6 @@ else TARGET_BINDIR ?= ../PackageFiles/bin/$(MULTIARCH) TARGET_LIBDIR ?= ../PackageFiles/lib/$(MULTIARCH) BUILDDIR_SUFFIX ?= .$(MULTIARCH) @@ -10,9 +16,9 @@ index 83a4076f..e0cb81f0 100644 endif ifeq ($(UNAME_S),Windows) -@@ -296,7 +295,7 @@ ifeq ($(UNAME_S),Windows) - JAVA_INC := -I$(PROGRAM_DIR_JAVA)/Java/jdk1.8.0_131/include - JAVA_INC += -I$(PROGRAM_DIR_JAVA)/Java/jdk1.8.0_131/include/win32 +@@ -249,7 +248,7 @@ ifeq ($(UNAME_S),Windows) + JAVA_INC := -I$(JAVA_DIR)/include + JAVA_INC += -I$(JAVA_DIR)/include/win32 else - JAVA_INC := -I/usr/lib/jvm/default-java/include $(jvm_includes) + JAVA_INC := -I/usr/lib/jvm/default/include -I/usr/lib/jvm/default/include/linux @@ -20,7 +26,7 @@ index 83a4076f..e0cb81f0 100644 #============================================================= diff --git a/Library.mk b/Library.mk -index 12657ad2..500f1939 100644 +index 00e780a3..b1797b47 100644 --- a/Library.mk +++ b/Library.mk @@ -39,17 +39,8 @@ ifeq ($(UNAME_S),Windows) @@ -44,10 +50,10 @@ index 12657ad2..500f1939 100644 ifeq ($(UNAME_S),Windows) diff --git a/USBDM_API_Example/Common.mk b/USBDM_API_Example/Common.mk -index d6f5d711..dcbc3b1c 100644 +index a0c70866..aa20dfc0 100644 --- a/USBDM_API_Example/Common.mk +++ b/USBDM_API_Example/Common.mk -@@ -47,7 +47,6 @@ else +@@ -62,7 +62,6 @@ else TARGET_BINDIR ?= ../PackageFiles/bin/$(MULTIARCH) TARGET_LIBDIR ?= ../PackageFiles/lib/$(MULTIARCH) BUILDDIR_SUFFIX ?= .$(MULTIARCH) @@ -55,9 +61,9 @@ index d6f5d711..dcbc3b1c 100644 endif ifeq ($(UNAME_S),Windows) -@@ -299,7 +298,7 @@ ifeq ($(UNAME_S),Windows) - JAVA_INC := -I$(PROGRAM_DIR_JAVA)/Java/jdk1.8.0_60/include - JAVA_INC += -I$(PROGRAM_DIR_JAVA)/Java/jdk1.8.0_60/include/win32 +@@ -246,7 +245,7 @@ ifeq ($(UNAME_S),Windows) + JAVA_INC := -I$(JAVA_DIR)/include + JAVA_INC += -I$(JAVA_DIR)/include/win32 else - JAVA_INC := -I/usr/lib/jvm/default-java/include $(jvm_includes) + JAVA_INC := -I/usr/lib/jvm/default/include -I/usr/lib/jvm/default/include/linux @@ -65,10 +71,10 @@ index d6f5d711..dcbc3b1c 100644 #============================================================= diff --git a/USBDM_Programmer_API_Example/Common.mk b/USBDM_Programmer_API_Example/Common.mk -index af7d8c90..3a1a635e 100644 +index a0c70866..aa20dfc0 100644 --- a/USBDM_Programmer_API_Example/Common.mk +++ b/USBDM_Programmer_API_Example/Common.mk -@@ -47,7 +47,6 @@ else +@@ -62,7 +62,6 @@ else TARGET_BINDIR ?= ../PackageFiles/bin/$(MULTIARCH) TARGET_LIBDIR ?= ../PackageFiles/lib/$(MULTIARCH) BUILDDIR_SUFFIX ?= .$(MULTIARCH) @@ -76,9 +82,9 @@ index af7d8c90..3a1a635e 100644 endif ifeq ($(UNAME_S),Windows) -@@ -290,7 +289,7 @@ ifeq ($(UNAME_S),Windows) - JAVA_INC := -I$(PROGRAM_DIR_JAVA)/Java/jdk1.8.0_60/include - JAVA_INC += -I$(PROGRAM_DIR_JAVA)/Java/jdk1.8.0_60/include/win32 +@@ -246,7 +245,7 @@ ifeq ($(UNAME_S),Windows) + JAVA_INC := -I$(JAVA_DIR)/include + JAVA_INC += -I$(JAVA_DIR)/include/win32 else - JAVA_INC := -I/usr/lib/jvm/default-java/include $(jvm_includes) + JAVA_INC := -I/usr/lib/jvm/default/include -I/usr/lib/jvm/default/include/linux |