diff options
Diffstat (limited to 'conf/Makefile')
| -rw-r--r-- | conf/Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/conf/Makefile b/conf/Makefile index db0060d75..e249e6069 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -69,12 +69,8 @@ install-data: $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \ else \ $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \ - grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \ - mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \ fi ; \ - $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \ - grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \ - mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \ + $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \ done $(INSTALL_DIR) -m 755 $(DATADIR)/mime for file in $(REPLACE); do \ @@ -122,10 +118,9 @@ install-libs: # uninstall: - for file in $(KEEP) $(REPLACE); do \ + for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \ $(RM) $(SERVERROOT)/$$file; \ done - $(RM) $(DATADIR)/cupsd.conf.default -$(RMDIR) $(SERVERROOT) for file in $(REPLACE); do \ $(RM) $(DATADIR)/mime/$$file; \ |