178f28d608
This unbreak building on head PR: 244903 Submitted by: kiwi@oav.net
27 lines
1.7 KiB
Plaintext
27 lines
1.7 KiB
Plaintext
--- cpp/build/Makefile.orig 2020-03-16 04:03:45 UTC
|
|
+++ cpp/build/Makefile
|
|
@@ -13,10 +13,10 @@
|
|
|
|
|
|
# what flags we will use for compiling in debug mode
|
|
-DEBUG_CFLAGS := -Wformat -Wall -Wno-unknown-pragmas -Wno-inline -Werror -Wno-error=sequence-point -Wno-sequence-point -ggdb -DDEBUG -fPIC -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\""
|
|
+DEBUG_CFLAGS := -Wformat -Wall -Wno-unknown-pragmas -Wno-inline -Wno-error=sequence-point -Wno-sequence-point -ggdb -DDEBUG -fPIC -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\""
|
|
DEBUG_CPPFLAGS := -std=c++11
|
|
# what flags we will use for compiling in release mode
|
|
-RELEASE_CFLAGS := -Wall -Wno-unknown-pragmas -Werror -Wno-error=sequence-point -Wno-sequence-point -O3 -DNDEBUG -fPIC -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\""
|
|
+RELEASE_CFLAGS := -Wall -Wno-unknown-pragmas -Wno-error=sequence-point -Wno-sequence-point -O3 -DNDEBUG -fPIC -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\""
|
|
RELEASE_CPPFLAGS := -std=c++11
|
|
#what flags we will use for linking in debug mode
|
|
DEBUG_LDFLAGS := -g
|
|
@@ -280,8 +280,8 @@ install: $(LIBDIR)/$(SHARED_LIB_NAME) doc $(top_buildd
|
|
@cp -r $(top_srcdir)/docs/* $(DESTDIR)/$(docdir)
|
|
@if [ -d "$(top_builddir)/docs/html/" ]; then cp -r $(top_builddir)/docs/html/* $(DESTDIR)/$(docdir); fi
|
|
@echo "Installing Pkg-config Files"
|
|
- @install -d $(DESTDIR)/$(pkgconfigdir)
|
|
- @cp $(top_builddir)/libopenzwave.pc $(DESTDIR)/$(pkgconfigdir)
|
|
+ @install -d $(DESTDIR)/$(PREFIX)/libdata/pkgconfig
|
|
+ @cp $(top_builddir)/libopenzwave.pc $(DESTDIR)/$(PREFIX)/libdata/pkgconfig
|
|
@install -d $(DESTDIR)/$(PREFIX)/bin/
|
|
@cp $(top_builddir)/ozw_config $(DESTDIR)/$(PREFIX)/bin/ozw_config
|
|
@chmod 755 $(DESTDIR)/$(PREFIX)/bin/ozw_config
|