summaryrefslogtreecommitdiff
path: root/conf/Makefile
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-09-24 23:50:39 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-09-24 23:50:39 +0000
commit18ecb4282108afe096df4958d992c80bb5f2b570 (patch)
treed41d1b895293498ec62aa785616eb291919db0cf /conf/Makefile
parent7a0cbd5e5715d715c3fddfaace2f800ef820d328 (diff)
downloadcups-18ecb4282108afe096df4958d992c80bb5f2b570.tar.gz
Merge changes from CUPS 1.5svn-r8829.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1695 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf/Makefile')
-rw-r--r--conf/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/Makefile b/conf/Makefile
index e8cdbfc10..4e3963e21 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -90,7 +90,7 @@ install-data:
done
-if test x$(PAMDIR) != x; then \
$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
- if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
+ if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
else \
$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \