File fix-build.patch of Package open-zwave-control-panel

Overview Repositories Revisions Requests Users Attributes Meta

File fix-build.patch of Package open-zwave-control-panel

diff --git a/Makefile b/Makefile
index a2ac64d..36e85ad 100644
--- a/Makefile
+++ b/Makefile
@@ -18,22 +18,19 @@ RELEASE_CFLAGS  := -Wall -Wno-unknown-pragmas -Werror -Wno-format -O3 -DNDEBUG
 DEBUG_LDFLAGS	:= -g
 
 # Change for DEBUG or RELEASE
-CFLAGS	:= -c $(DEBUG_CFLAGS)
+CFLAGS	:= -fPIC -c $(DEBUG_CFLAGS)
 LDFLAGS	:= $(DEBUG_LDFLAGS)
 
-OPENZWAVE := ../open-zwave/
 LIBMICROHTTPD := -L/usr/local/lib/ -lmicrohttpd
 
-INCLUDES := -I $(OPENZWAVE)/cpp/src -I $(OPENZWAVE)/cpp/src/command_classes/ \
-	-I $(OPENZWAVE)/cpp/src/value_classes/ -I $(OPENZWAVE)/cpp/src/platform/ \
-	-I $(OPENZWAVE)/cpp/src/platform/unix -I $(OPENZWAVE)/cpp/tinyxml/ \
-	-I /usr/local/include/
+OPENZWAVE := /usr/include/openzwave
+INCLUDES := -I/usr/include/openzwave -I/usr/include/openzwave/platform -I/usr/include/openzwave/value_classes
 
 # Remove comment below for gnutls support
 #GNUTLS := -lgnutls
 
 # for Linux uncomment out next three lines
-LIBZWAVE := $(wildcard $(OPENZWAVE)/*.a)
+LIBZWAVE := -lopenzwave
 #LIBUSB := -ludev
 #LIBS := $(LIBZWAVE) $(GNUTLS) $(LIBMICROHTTPD) -pthread $(LIBUSB) -lresolv
 
@@ -41,7 +38,7 @@ LIBZWAVE := $(wildcard $(OPENZWAVE)/*.a)
 #ARCH := -arch i386 -arch x86_64
 #CFLAGS += $(ARCH)
 #LIBZWAVE := $(wildcard $(OPENZWAVE)/cpp/lib/mac/*.a)
-LIBUSB := -framework IOKit -framework CoreFoundation
+#LIBUSB := -framework IOKit -framework CoreFoundation
 LIBS := $(LIBZWAVE) $(GNUTLS) $(LIBMICROHTTPD) -pthread $(LIBUSB) $(ARCH) -lresolv
 
 %.o : %.cpp
@@ -59,13 +56,13 @@ ifeq ($(LIBZWAVE),)
 	@exit 1
 endif
 
-ozwcp.o: ozwcp.h webserver.h $(OPENZWAVE)/cpp/src/Options.h $(OPENZWAVE)/cpp/src/Manager.h \
-	$(OPENZWAVE)/cpp/src/Node.h $(OPENZWAVE)/cpp/src/Group.h \
-	$(OPENZWAVE)/cpp/src/Notification.h $(OPENZWAVE)/cpp/src/platform/Log.h
+ozwcp.o: ozwcp.h webserver.h $(OPENZWAVE)/Options.h $(OPENZWAVE)/Manager.h \
+	$(OPENZWAVE)/Node.h $(OPENZWAVE)/Group.h \
+	$(OPENZWAVE)/Notification.h $(OPENZWAVE)/platform/Log.h
 
-webserver.o: webserver.h ozwcp.h $(OPENZWAVE)/cpp/src/Options.h $(OPENZWAVE)/cpp/src/Manager.h \
-	$(OPENZWAVE)/cpp/src/Node.h $(OPENZWAVE)/cpp/src/Group.h \
-	$(OPENZWAVE)/cpp/src/Notification.h $(OPENZWAVE)/cpp/src/platform/Log.h
+webserver.o: webserver.h ozwcp.h $(OPENZWAVE)/Options.h $(OPENZWAVE)/Manager.h \
+	$(OPENZWAVE)/Node.h $(OPENZWAVE)/Group.h \
+	$(OPENZWAVE)/Notification.h $(OPENZWAVE)/platform/Log.h
 
 ozwcp:	ozwcp.o webserver.o zwavelib.o $(LIBZWAVE)
 	$(LD) -o $@ $(LDFLAGS) ozwcp.o webserver.o zwavelib.o $(LIBS)
diff --git a/webserver.cpp b/webserver.cpp
index f6aa67b..1a43fd5 100644
--- a/webserver.cpp
+++ b/webserver.cpp
@@ -1126,13 +1126,13 @@ int Webserver::Handler (struct MHD_Connection *conn, const char *url,
 	if (strcmp(method, MHD_HTTP_METHOD_GET) == 0) {
 		if (strcmp(url, "/") == 0 ||
 				strcmp(url, "/index.html") == 0)
-			ret = web_send_file(conn, "cp.html", MHD_HTTP_OK, false);
+			ret = web_send_file(conn, "/usr/share/open-zwave-control-panel/cp.html", MHD_HTTP_OK, false);
 		else if (strcmp(url, "/scenes.html") == 0)
-			ret = web_send_file(conn, "scenes.html", MHD_HTTP_OK, false);
+			ret = web_send_file(conn, "/usr/share/open-zwave-control-panel/scenes.html", MHD_HTTP_OK, false);
 		else if (strcmp(url, "/cp.js") == 0)
-			ret = web_send_file(conn, "cp.js", MHD_HTTP_OK, false);
+			ret = web_send_file(conn, "/usr/share/open-zwave-control-panel/cp.js", MHD_HTTP_OK, false);
 		else if (strcmp(url, "/favicon.png") == 0)
-			ret = web_send_file(conn, "openzwavetinyicon.png", MHD_HTTP_OK, false);
+			ret = web_send_file(conn, "/usr/share/open-zwave-control-panel/openzwavetinyicon.png", MHD_HTTP_OK, false);
 		else if (strcmp(url, "/poll.xml") == 0 && (devname != NULL || usb))
 			ret = SendPollResponse(conn);
 		else if (strcmp(url, "/devices.xml") == 0 && (devname != NULL || usb))

Places

File fix-build.patch of Package open-zwave-control-panel

Places