Fix system install

config.mk.acr

@@ -6,6 +6,7 @@ HOST_OS=@HOST_OS@
 LIBDIR=@LIBDIR@
 INSTALL_LIB=@INSTALL_LIB@
 
+R2_LIBR_PLUGINS_DIR=$(shell r2 -H R2_LIBR_PLUGINS)
 R2PM_USRPLUGIN_DIR=$(shell r2 -H R2_USER_PLUGINS)
 LIBEXT=$(shell r2 -H R2_LIBEXT)
 #LIBYARA_CFLAGS=@LIBYARA_CFLAGS@

src/Makefile

@@ -3,6 +3,7 @@ include ../config.mk
 CFLAGS+=-g
 
 MOD=core_yara
+RULESDIR=rules-yara3
 
 all: $(MOD).$(LIBEXT)
 
@@ -15,20 +16,25 @@ clean:
 mrproper: clean
 	rm -f Makefile
 
-RULESDIR=$(R2PM_USRPLUGIN_DIR)/rules-yara3
+install:
+	${INSTALL_LIB} ${MOD}.${LIBEXT} $(R2_LIBR_PLUGINS_DIR)/${MOD}.${LIBEXT}
+	mkdir -p $(R2_LIBR_PLUGINS_DIR)/$(RULESDIR)
+	cp -f ../rules/*.yara $(R2_LIBR_PLUGINS_DIR)/$(RULESDIR)/
 
-user-install install:
+user-install:
 	${INSTALL_LIB} ${MOD}.${LIBEXT} $(R2PM_USRPLUGIN_DIR)/${MOD}.${LIBEXT}
-	mkdir -p $(RULESDIR)
-	cp -rf ../rules/*.yara $(RULESDIR)
+	mkdir -p $(R2PM_USRPLUGIN_DIR)/$(RULESDIR)
+	cp -f ../rules/*.yara $(R2PM_USRPLUGIN_DIR)/$(RULESDIR)/
 
 symstall:
 	ln -fs ${PWD}/${MOD}.${LIBEXT} $(R2PM_USRPLUGIN_DIR)/$(MOD).$(LIBEXT)
-	rm -rf $(R2PM_USRPLUGIN_DIR)/yara
-	mkdir -p $(RULESDIR)
-	for a in *.gz ; do ln -fs $(PWD)/$$a $(RULESDIR)/$$a ; done
+	mkdir -p $(R2PM_USRPLUGIN_DIR)/$(RULESDIR)
+	for a in *.gz ; do ln -fs $(PWD)/$$a $(R2PM_USRPLUGIN_DIR)/$(RULESDIR)/$$a ; done
 
-user-uninstall uninstall:
+uninstall:
+	rm -f ${R2_LIBR_PLUGINS_DIR}/$(MOD).$(LIBEXT)
+	rm -rf $(R2_LIBR_PLUGINS_DIR)/$(RULESDIR)
+
+user-uninstall:
 	rm -f ${R2PM_USRPLUGIN_DIR}/$(MOD).$(LIBEXT)
-	rm -rf $(RULESDIR)
-	rm -rf ${R2PM_USRPLUGIN_DIR}/yara
+	rm -rf $(R2PM_USRPLUGIN_DIR)/$(RULESDIR)