Skip to content

Commit 9f0b54b

Browse files
committed
Fixed problem with PKGLIBEXEC variable
1 parent e7ab226 commit 9f0b54b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fi
8181

8282
AC_DEFINE(_GNU_SOURCE, 1, [Define unconditionally for setting a GNU environment.])
8383

84-
CFLAGS="$CFLAGS -Wall -DDATADIR=\"\\\"${datadir}/ddccontrol-db\\\"\" -DBINDIR=\"\\\"${bindir}\\\"\" -DPKGLIBEXECDIR=\"\\\"${pkglibexecdir}\\\"\""
84+
CFLAGS="$CFLAGS -Wall -DDATADIR=\"\\\"${datadir}/ddccontrol-db\\\"\" -DBINDIR=\"\\\"${bindir}\\\"\""
8585

8686

8787
# Check for extra libraries

src/lib/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
localedir = $(datadir)/locale
2+
AM_CFLAGS = -DDDCPCIDIR=\"${pkglibexecdir}\" $(LIBXML2_CFLAGS)
23
AM_CPPFLAGS = -I$(top_srcdir)/src -DLOCALEDIR=\"$(localedir)\"
34

45
pkginclude_HEADERS = conf.h monitor_db.h ddcci.h ddcpci-ipc.h
@@ -14,4 +15,3 @@ libddccontrol_la_SOURCES = ddcci.c ddcci.h monitor_db.c monitor_db.h \
1415
ddcpci-ipc.h i2c-dev.h conf.c conf.h amd_adl.c amd_adl.h internal.h
1516

1617
libddccontrol_la_LIBADD = $(LIBXML2_LDFLAGS)
17-
AM_CFLAGS = $(LIBXML2_CFLAGS)

src/lib/ddcci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ int ddcpci_init()
142142
printf("ddcpci initing...\n");
143143
}
144144

145-
key_t key = ftok(PKGLIBEXECDIR "/ddcpci", getpid());
145+
key_t key = ftok(DDCPCIDIR "/ddcpci", getpid());
146146

147147
if ((msqid = msgget(key, IPC_CREAT | 0666)) < 0) {
148148
perror(_("Error while initialisating the message queue"));
@@ -151,7 +151,7 @@ int ddcpci_init()
151151

152152
char buffer[256];
153153

154-
snprintf(buffer, 256, PKGLIBEXECDIR "/ddcpci %d %d &", verbosity, key);
154+
snprintf(buffer, 256, DDCPCIDIR "/ddcpci %d %d &", verbosity, key);
155155

156156
if (verbosity) {
157157
printf("Starting %s...\n", buffer);

0 commit comments

Comments
 (0)