fixed a few sillies

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index c5ff3689d0c42f44aaba4e66f30f35f1a5b7e2cb..32aa1a871408872c747d15b35f4c0e747457883a 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -222,19 +222,19 @@ install-data:
        done
        @for i in citadel.rc public_clients \
                 `find help messages network -type f | grep -v CVS`; do \
-               $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
                echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
+               $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
        done
        @if test -d $(root)/etc/pam.d; then \
-               $(INSTALL_DATA) citadel.pam $(root)/etc/pam.d/citadel; \
                echo $(INSTALL_DATA) citadel.pam $(root)/etc/pam.d/citadel; \
+               $(INSTALL_DATA) citadel.pam $(root)/etc/pam.d/citadel; \
        fi
 
 install-doc:
        @./mkinstalldirs $(root)$(prefix)/techdoc
        @for i in *.txt `find techdoc -type f | grep -v CVS`; do \
-               $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
                echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
+               $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \
        done
 
 install-exec: all weekly
@@ -245,13 +245,13 @@ install-exec: all weekly
                 $(PROXY_TARGETS) $(SERV_MODULES) utilsmenu weekly \
                 dnetsetup; do \
                if test -f $$i; then \
-                       $(INSTALL) $$i $(root)$(prefix)/$$i; \
                        echo $(INSTALL) $$i $(root)$(prefix)/$$i; \
+                       $(INSTALL) $$i $(root)$(prefix)/$$i; \
                fi \
        done
        @if test -f $(root)$(prefix)/chkpwd; then \
+               echo chmod u+s $(root)$(prefix)/chkpwd; \
                chmod u+s $(root)$(prefix)/chkpwd; \
-               echo chmod +s $(root)$(prefix)/chkpwd; \
        fi
 
 clean:
@@ -262,12 +262,12 @@ cleaner: clean
                modules/*.[ms]o $(PROXY_TARGETS) so_locations
 
 distclean: cleaner
+       find . -name '*~' -or -name '.#*' | xargs rm -f
        rm -f Makefile sysdep.h config.cache config.log config.status *.d weekly
-       rm -f `find . -name '*~'` `find . -name '.#*'`
 
 .c.d:
        @echo Checking dependencies for $<
-       @$(CC) -M $(CPPFLAGS) $< | sed -e 's!$*.o!$*.o $*.ro $*.mo $@!' > $@
+       @$(CC) -M $(CPPFLAGS) $(PTHREAD_DEFS) $< | sed -e 's!$*.o!$*.o $*.ro $*.mo $@!' > $@
        @test -s $@ || rm -f $@
 
 Makefile: $(srcdir)/Makefile.in config.status