30 files changed, 86 insertions, 60 deletions
diff --git a/config.mk.in b/config.mk.in
index 958efdb34..493a1f96f 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -81,7 +81,7 @@ LDFLAGS=@LDFLAGS@
 # Project variables
 EXTRA_CFLAGS  =@EXTRA_CFLAGS@
 COMMON_CFLAGS = \
-        -ggdb -O2 -DVERSION='"$(VERSION)"' -DMOD_DIR='"$(MOD_DIR)"' \
+        -ggdb -O2 -DVERSION='"$(VERSION)"' \
        -Wall -Wextra $(HAVE_FATAL_WARNINGS) \
        -Wformat -Wformat-security \
        -fstack-protector-all -D_FORTIFY_SOURCE=2 \
diff --git a/src/etc-cleanup/Makefile b/src/etc-cleanup/Makefile
index 296ed41d8..23121c521 100644
--- a/src/etc-cleanup/Makefile
+++ b/src/etc-cleanup/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/etc-cleanup
+MOD = etc-cleanup
-PROG = etc-cleanup
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = ../include/etc_groups.h
diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile
index 1f6a28780..f0e374a52 100644
--- a/src/fbuilder/Makefile
+++ b/src/fbuilder/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/fbuilder
+MOD = fbuilder
-PROG = fbuilder
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = ../include/common.h ../include/syscall.h
diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile
index f82d3a073..a9f706eb8 100644
--- a/src/fcopy/Makefile
+++ b/src/fcopy/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/fcopy
+MOD = fcopy
-PROG = fcopy
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = ../include/common.h ../include/syscall.h
diff --git a/src/fids/Makefile b/src/fids/Makefile
index c03740e3d..7bdbe0590 100644
--- a/src/fids/Makefile
+++ b/src/fids/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/fids
+MOD = fids
-PROG = fids
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = ../include/common.h
diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile
index 322ce3e3f..cc7a27c52 100644
--- a/src/firecfg/Makefile
+++ b/src/firecfg/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/firecfg
+MOD = firecfg
-PROG = firecfg
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = \
diff --git a/src/firejail/Makefile b/src/firejail/Makefile
index a817b1757..1c4b1b5c2 100644
--- a/src/firejail/Makefile
+++ b/src/firejail/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/firejail
+MOD = firejail
-PROG = firejail
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = \
diff --git a/src/firemon/Makefile b/src/firemon/Makefile
index 649bad0af..0e39f8b01 100644
--- a/src/firemon/Makefile
+++ b/src/firemon/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/firemon
+MOD = firemon
-PROG = firemon
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = ../include/common.h ../include/pid.h
diff --git a/src/fldd/Makefile b/src/fldd/Makefile
index 00173d18e..246cbc183 100644
--- a/src/fldd/Makefile
+++ b/src/fldd/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/fldd
+MOD = fldd
-PROG = fldd
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h
diff --git a/src/fnet/Makefile b/src/fnet/Makefile
index 04a200951..c98326dc4 100644
--- a/src/fnet/Makefile
+++ b/src/fnet/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/fnet
+MOD = fnet
-PROG = fnet
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = ../include/common.h ../include/libnetlink.h
diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile
index d38185fb1..c8992c3d6 100644
--- a/src/fnetfilter/Makefile
+++ b/src/fnetfilter/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/fnetfilter
+MOD = fnetfilter
-PROG = fnetfilter
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = ../include/common.h ../include/syscall.h
diff --git a/src/fnetlock/Makefile b/src/fnetlock/Makefile
index 789df06ac..386b32082 100644
--- a/src/fnetlock/Makefile
+++ b/src/fnetlock/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/fnetlock
+MOD = fnetlock
-PROG = fnetlock
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 include $(ROOT)/src/prog.mk
diff --git a/src/fnettrace-dns/Makefile b/src/fnettrace-dns/Makefile
index fb1054261..e7180de3f 100644
--- a/src/fnettrace-dns/Makefile
+++ b/src/fnettrace-dns/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/fnettrace-dns
+MOD = fnettrace-dns
-PROG = fnettrace-dns
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 include $(ROOT)/src/prog.mk
diff --git a/src/fnettrace-icmp/Makefile b/src/fnettrace-icmp/Makefile
index 4791e0b9f..d449fbe76 100644
--- a/src/fnettrace-icmp/Makefile
+++ b/src/fnettrace-icmp/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/fnettrace-icmp
+MOD = fnettrace-icmp
-PROG = fnettrace-icmp
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 include $(ROOT)/src/prog.mk
diff --git a/src/fnettrace-sni/Makefile b/src/fnettrace-sni/Makefile
index 09a444db0..80af5e914 100644
--- a/src/fnettrace-sni/Makefile
+++ b/src/fnettrace-sni/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/fnettrace-sni
+MOD = fnettrace-sni
-PROG = fnettrace-sni
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 include $(ROOT)/src/prog.mk
diff --git a/src/fnettrace/Makefile b/src/fnettrace/Makefile
index 68a4cbdc0..2ad296d1d 100644
--- a/src/fnettrace/Makefile
+++ b/src/fnettrace/Makefile
@@ -2,12 +2,13 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/fnettrace
+MOD = fnettrace
-PROG = fnettrace
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 include $(ROOT)/src/prog.mk
 all: $(TARGET) static-ip-map
-static-ip-map: static-ip-map.txt fnettrace
+static-ip-map: static-ip-map.txt $(PROG)
-        ./fnettrace --squash-map=static-ip-map.txt > static-ip-map
+        ./$(PROG) --squash-map=static-ip-map.txt > static-ip-map
diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile
index 12ac5f1a9..caead9d54 100644
--- a/src/fsec-optimize/Makefile
+++ b/src/fsec-optimize/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/fsec-optimize
+MOD = fsec-optimize
-PROG = fsec-optimize
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile
index a506c1106..43cc42fed 100644
--- a/src/fsec-print/Makefile
+++ b/src/fsec-print/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/fsec-print
+MOD = fsec-print
-PROG = fsec-print
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile
index a7d88eb83..89b12f629 100644
--- a/src/fseccomp/Makefile
+++ b/src/fseccomp/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/fseccomp
+MOD = fseccomp
-PROG = fseccomp
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = ../include/common.h ../include/syscall.h
diff --git a/src/ftee/Makefile b/src/ftee/Makefile
index 1b1cdec43..f4d95de4a 100644
--- a/src/ftee/Makefile
+++ b/src/ftee/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/ftee
+MOD = ftee
-PROG = ftee
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 include $(ROOT)/src/prog.mk
diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile
index cb80ec0bc..3c1aa0574 100644
--- a/src/fzenity/Makefile
+++ b/src/fzenity/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/fzenity
+MOD = fzenity
-PROG = fzenity
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = ../include/common.h
diff --git a/src/include/common.h b/src/include/common.h
index 03a71967b..5f09fe3e2 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -41,8 +41,8 @@
 #define errExit(msg) do { \
        char msgout[500]; \
-        snprintf(msgout, 500, "Error %s/%s:%d: %s: %s", \
+        snprintf(msgout, 500, "Error %s:%d: %s: %s", \
-                 MOD_DIR, __FILE__, __LINE__, __func__, msg); \
+                 __FILE__, __LINE__, __func__, msg); \
        perror(msgout); \
        exit(1); \
 } while (0)
diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile
index 0b57861c6..1823ee9d0 100644
--- a/src/jailcheck/Makefile
+++ b/src/jailcheck/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/jailcheck
+MOD = jailcheck
-PROG = jailcheck
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = ../include/common.h ../include/pid.h
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 9cf8abe36..4b2303e52 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -2,7 +2,8 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/lib
+MOD = lib
+MOD_DIR = $(ROOT)/src/$(MOD)
 TARGET = lib
 include $(ROOT)/src/prog.mk
diff --git a/src/libpostexecseccomp/Makefile b/src/libpostexecseccomp/Makefile
index c9e25d066..f66fdd0d7 100644
--- a/src/libpostexecseccomp/Makefile
+++ b/src/libpostexecseccomp/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/libpostexecseccomp
+MOD = libpostexecseccomp
-SO = libpostexecseccomp.so
+MOD_DIR = $(ROOT)/src/$(MOD)
+SO = $(MOD_DIR)/$(MOD).so
 TARGET = $(SO)
 EXTRA_HDRS = ../include/seccomp.h ../include/rundefs.h
diff --git a/src/libtrace/Makefile b/src/libtrace/Makefile
index 337529361..3493d1786 100644
--- a/src/libtrace/Makefile
+++ b/src/libtrace/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/libtrace
+MOD = libtrace
-SO = libtrace.so
+MOD_DIR = $(ROOT)/src/$(MOD)
+SO = $(MOD_DIR)/$(MOD).so
 TARGET = $(SO)
 include $(ROOT)/src/so.mk
diff --git a/src/libtracelog/Makefile b/src/libtracelog/Makefile
index 3e9d9e3e3..a83726167 100644
--- a/src/libtracelog/Makefile
+++ b/src/libtracelog/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/libtracelog
+MOD = libtracelog
-SO = libtracelog.so
+MOD_DIR = $(ROOT)/src/$(MOD)
+SO = $(MOD_DIR)/$(MOD).so
 TARGET = $(SO)
 EXTRA_HDRS = ../include/rundefs.h
diff --git a/src/profstats/Makefile b/src/profstats/Makefile
index aa947401e..8f33ce1de 100644
--- a/src/profstats/Makefile
+++ b/src/profstats/Makefile
@@ -2,8 +2,9 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
-MOD_DIR = src/profstats
+MOD = profstats
-PROG = profstats
+MOD_DIR = $(ROOT)/src/$(MOD)
+PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 EXTRA_HDRS = ../include/common.h
diff --git a/src/prog.mk b/src/prog.mk
index b7ac59785..7797f56b6 100644
--- a/src/prog.mk
+++ b/src/prog.mk
@@ -5,8 +5,8 @@
 # The includer should probably define PROG and TARGET and may also want to
 # define EXTRA_HDRS and EXTRA_OBJS and extend CLEANFILES.
-HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS)
+HDRS := $(sort $(wildcard $(MOD_DIR)/*.h)) $(EXTRA_HDRS)
-SRCS := $(sort $(wildcard *.c))
+SRCS := $(sort $(wildcard $(MOD_DIR)/*.c))
 OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS)
 .PHONY: all
diff --git a/src/so.mk b/src/so.mk
index c1913b794..ceee9021f 100644
--- a/src/so.mk
+++ b/src/so.mk
@@ -5,8 +5,8 @@
 # The includer should probably define SO and TARGET and may also want to define
 # EXTRA_HDRS and EXTRA_OBJS and extend CLEANFILES.
-HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS)
+HDRS := $(sort $(wildcard $(MOD_DIR)/*.h)) $(EXTRA_HDRS)
-SRCS := $(sort $(wildcard *.c))
+SRCS := $(sort $(wildcard $(MOD_DIR)/*.c))
 OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS)
 .PHONY: all