Merge pull request #29 from kravemir/ddcpci-pkglibexecdir

Author: kravemir

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 - show warning message without blinking
+- install binary ddcpci to pkglibexec directory (it's not run by users)
 
 ## 0.4.3 - 2017-12-28
 ### Removed

README.md

@@ -40,7 +40,7 @@ Clone, build and install built version:
 git clone https://github.com/ddccontrol/ddccontrol.git
 cd ddccontrol
 ./autogen.sh
-./configure --prefix=/usr/
+./configure --prefix=/usr/ --libexecdir=/usr/lib
 make
 sudo make install
 ```

configure.ac

@@ -81,7 +81,8 @@ fi
 
 AC_DEFINE(_GNU_SOURCE, 1, [Define unconditionally for setting a GNU environment.])
 
-CFLAGS="$CFLAGS -Wall  -DDATADIR=\"\\\"${datadir}/ddccontrol-db\\\"\" -DBINDIR=\"\\\"${bindir}\\\"\""
+CFLAGS="$CFLAGS -Wall  -DDATADIR=\"\\\"${datadir}/ddccontrol-db\\\"\" -DBINDIR=\"\\\"${bindir}\\\"\" -DPKGLIBEXECDIR=\"\\\"${pkglibexecdir}\\\"\""
+
 
 # Check for extra libraries
 

src/ddcpci/Makefile.am

@@ -1,10 +1,12 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/lib  -DLOCALEDIR=\"$(localedir)\"
 
-bin_PROGRAMS = ddcpci
+# install to libexec, because it's not intended to be run by user
+pkglibexec_PROGRAMS = ddcpci
+
 ddcpci_LDFLAGS = -Wl,-z,now
 ddcpci_SOURCES = main.c nvidia.c radeon.c i2c-algo-bit.c intel810.c ddcpci.h i2c-algo-bit.h via.c sis.c
 
 EXTRA_DIST = intel740.c
 
 install-exec-hook:
-	chmod 4711 ${DESTDIR}/${bindir}/ddcpci
+	chmod 4711 ${DESTDIR}/${pkglibexecdir}/ddcpci

src/lib/ddcci.c

@@ -142,7 +142,7 @@ int ddcpci_init()
 			printf("ddcpci initing...\n");
 		}
 
-		key_t key = ftok(BINDIR "/ddcpci", getpid());
+		key_t key = ftok(PKGLIBEXECDIR "/ddcpci", getpid());
 
 		if ((msqid = msgget(key, IPC_CREAT | 0666)) < 0) {
 			perror(_("Error while initialisating the message queue"));
@@ -151,7 +151,7 @@ int ddcpci_init()
 
 		char buffer[256];
 
-		snprintf(buffer, 256, BINDIR "/ddcpci %d %d &", verbosity, key);
+		snprintf(buffer, 256, PKGLIBEXECDIR "/ddcpci %d %d &", verbosity, key);
 
 		if (verbosity) {
 			printf("Starting %s...\n", buffer);