From 052e56ccd662fba25abd7780be5feb66a8e0710b Mon Sep 17 00:00:00 2001
From: Mykyta Holubakha <hilobakho@gmail.com>
Date: Sun, 2 Feb 2020 13:58:53 +0100
Subject: Build fixup

systemd install fixup

Closes #42, #44
---
 Makefile        | 11 ++++++-----
 brightnessctl.c |  5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index fcd746a..c895ee7 100644
--- a/Makefile
+++ b/Makefile
@@ -11,17 +11,18 @@ INSTALL_UDEV_RULES = 1
 INSTALL_UDEV_1 = install_udev_rules
 UDEVDIR ?= /lib/udev/rules.d
 
-MODE_0 = 4711
-MODE_1 = 0755
-MODE = ${MODE_${INSTALL_UDEV_RULES}}
-
 ifdef ENABLE_SYSTEMD
 	CFLAGS += ${shell pkg-config --cflags libsystemd}
 	LDLIBS += ${shell pkg-config --libs libsystemd}
 	CPPFLAGS += -DENABLE_SYSTEMD
-	MODE = 0755
+	INSTALL_UDEV_RULES=0
 endif
 
+MODE_0 = 4711
+MODE_1 = 0755
+MODE = ${MODE_${INSTALL_UDEV_RULES}}
+
+
 all: brightnessctl brightnessctl.1
 
 install: all ${INSTALL_UDEV_${INSTALL_UDEV_RULES}}
diff --git a/brightnessctl.c b/brightnessctl.c
index a210b87..6045ec3 100644
--- a/brightnessctl.c
+++ b/brightnessctl.c
@@ -35,7 +35,7 @@ static char *_cat_with(char, ...);
 static char *dir_child(char *, char*);
 static char *device_path(struct device *);
 static char *class_path(char *);
-static void apply_value(struct device *, struct value *);
+static unsigned int calc_value(struct device *, struct value *);
 static int apply_operation(struct device *, enum operation, struct value *);
 static bool parse_value(struct value *, char *);
 static bool do_write_device(struct device *);
@@ -48,6 +48,7 @@ static struct device *find_device(struct device **, char *);
 static bool save_device_data(struct device *);
 static bool restore_device_data(struct device *);
 static bool ensure_dir(char *);
+static bool ensure_dev_dir(struct device *);
 #define ensure_run_dir() ensure_dir(run_dir)
 
 #ifdef ENABLE_SYSTEMD
@@ -251,7 +252,7 @@ int apply_operation(struct device *dev, enum operation operation, struct value *
 		fprintf(stdout, "%u\n", dev->max_brightness);
 		return 0;
 	case SET:
-		apply_value(dev, val);
+		dev->curr_brightness = calc_value(dev, val);
 		if (!p.pretend)
 			if (!write_device(dev))
 				goto fail;
-- 
cgit v1.2.3