Fix MAKE program detection

cirnatdan · Jun 28, 2021 · f9e88f0 · f9e88f0
1 parent acd961f
commit f9e88f0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/src/commands.h b/src/commands.h
@@ -0,0 +1 @@
+#include "pkgsrc.h"
diff --git a/src/flag.c b/src/flag.c
@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <string.h>
 #include "config.h"
-#include "include/commands.h"
+#include "commands.h"
 
 static void
 usage()

diff --git a/src/include/commands.h b/src/include/commands.h
diff --git a/src/include/pkgsrc.c → src/pkgsrc.c b/src/include/pkgsrc.c → src/pkgsrc.c
@@ -52,6 +52,14 @@ const char * const skip[] = {
 	"licenses", "mk", "packages", NULL
 };
 
+#define QUOTE(s) #s
+#define STR(s) QUOTE(s)
+
+#define PKGSRC_INSTALL STR(MAKE) " install clean clean-depends"
+#define PKGSRC_REPLACE STR(MAKE) " replace clean clean-depends"
+#define PKGSRC_OPTIONS STR(MAKE) " show-options"
+#define PKGSRC_DEPENDS STR(MAKE) " show-depends"
+#define PKGSRC_REMOVE STR(MAKE) " deinstall"
 int		(*match)(const char *, const char *, int);
 
 
@@ -156,7 +164,7 @@ pkgsrc_options(const char *pkgsrc_path, struct package package)
 	snprintf(package_dir, sizeof(package_dir), "%s/%s", pkgsrc_path, package.path);
 
 	chdir(package_dir);
-	system("MAKE show-options");
+	system(PKGSRC_OPTIONS);
 }
 
 void
@@ -166,7 +174,7 @@ pkgsrc_install(const char *pkgsrc_path, struct package package)
 	snprintf(package_dir, sizeof(package_dir), "%s/%s", pkgsrc_path, package.path);
 
 	chdir(package_dir);
-	system("MAKE install clean clean-depends");
+	system(PKGSRC_INSTALL);
 }
 
 void
@@ -176,7 +184,7 @@ pkgsrc_remove(const char *pkgsrc_path, struct package package)
 	snprintf(package_dir, sizeof(package_dir), "%s/%s", pkgsrc_path, package.path);
 
 	chdir(package_dir);
-	system("MAKE deinstall");
+	system(PKGSRC_REMOVE);
 }
 
 void
@@ -186,5 +194,5 @@ pkgsrc_dependencies(const char *pkgsrc_path, struct package package)
 	snprintf(package_dir, sizeof(package_dir), "%s/%s", pkgsrc_path, package.path);
 
 	chdir(package_dir);
-	system("MAKE show-depends");
-}
+	system(PKGSRC_DEPENDS);
+}
diff --git a/src/include/pkgsrc.h → src/pkgsrc.h b/src/include/pkgsrc.h → src/pkgsrc.h
@@ -1,3 +1,5 @@
+#include "defaults.h"
+
 struct package {
     char name[50];
     char description[250];