plist+install: .plist.auto is always equal to .plist

SynoCommunity · Jan 3, 2022 · d442ce2 · d442ce2
1 parent 70a1807
commit d442ce2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/mk/spksrc.install.mk b/mk/spksrc.install.mk
@@ -63,8 +63,6 @@ post_install_target: $(INSTALL_TARGET)
 $(INSTALL_PLIST):
 	find $(INSTALL_DIR)/$(INSTALL_PREFIX)/ \! -type d -printf '%P\n' | sort | \
 	  diff $(PRE_INSTALL_PLIST) -  | grep '>' | cut -d' ' -f2- > $@
-	# Generate $(PKG_NAME).plist.auto for newly added files (diff against .tmp)
-	comm -3 $(PRE_INSTALL_PLIST) $(INSTALL_PLIST) > $(INSTALL_PLIST).auto
 
 install_correct_lib_files: $(INSTALL_PLIST)
 	@for pc_file in `grep -e "^lib/pkgconfig/.*\.pc$$" $(INSTALL_PLIST)` ; \

diff --git a/mk/spksrc.plist.mk b/mk/spksrc.plist.mk
@@ -21,7 +21,7 @@ cat_PLIST:
 	# If there is a PLIST.auto file or if parent directory is kernel \
 	elif [ -f PLIST.auto -o $$(basename $$(dirname $$(pwd))) = "kernel" ] ; \
 	then \
-	  cat $(WORK_DIR)/$(PKG_NAME).plist.auto | sort | while read -r file ; \
+	  cat $(WORK_DIR)/$(PKG_NAME).plist | sort | while read -r file ; \
 	  do \
 	    type=$$(file --brief "$(INSTALL_DIR)/$(INSTALL_PREFIX)/$$file" | cut -d , -f1) ; \
 	    case $$type in \