Changeset 3450

Show
Ignore:
Timestamp:
04/01/08 19:04:33 (9 months ago)
Author:
alonbl
Message:

More separate srcdir fixups

Location:
trunk
Files:
21 modified

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.am

    r3417 r3450  
    33 
    44MAINTAINERCLEANFILES = \ 
    5         Makefile.in config.h.in config.h.in~ configure \ 
    6         install-sh ltmain.sh missing mkinstalldirs \ 
    7         compile depcomp config.log config.status \ 
    8         config.guess config.sub acinclude.m4 aclocal.m4 \ 
    9         packaged 
     5        config.log config.status \ 
     6        $(srcdir)/Makefile.in \ 
     7        $(srcdir)/config.h.in $(srcdir)/config.h.in~ $(srcdir)/configure \ 
     8        $(srcdir)/install-sh $(srcdir)/ltmain.sh $(srcdir)/missing \ 
     9        $(srcdir)/depcomp $(srcdir)/aclocal.m4 \ 
     10        $(srcdir)/config.guess $(srcdir)/config.sub \ 
     11        $(srcdir)/packaged 
    1012EXTRA_DIST = Makefile.mak svnignore 
    1113 

  • trunk/aclocal/Makefile.am

    r3414 r3450  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22EXTRA_DIST = acx_pthread.m4 libassuan.m4 

  • trunk/configure.ac

    r3446 r3450  
    3434 
    3535AC_MSG_CHECKING([svn checkout]) 
    36 if test -e packaged; then 
     36if test -e "${srcdir}/packaged"; then 
    3737        svn_checkout="no" 
    3838else 

  • trunk/doc/Makefile.am

    r3448 r3450  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33wikidir=$(htmldir)/wiki 
    … …  
    8080 
    8181maintainer-clean-local: 
    82         rm -rf html.out html.tmp man.out man.tmp api.work 
     82        rm -rf "$(srcdir)/html.out" "$(srcdir)/man.out" \ 
     83                html.out html.tmp man.out man.tmp api.work 

  • trunk/doc/nonpersistent/Makefile.am

    r3448 r3450  
    1 MAINTAINERCLEANFILES = Makefile.in ChangeLog ChangeLog.tmp 
     1MAINTAINERCLEANFILES = \ 
     2        $(srcdir)/Makefile.in $(srcdir)/ChangeLog \ 
     3        ChangeLog ChangeLog.tmp  
    24 
    35wikidir=$(htmldir)/wiki 
    … …  
    1416        WGET="$(WGET)" WGET_OPTS="$(WGET_OPTS)" SED="$(SED)" TR="$(TR)" XSLTPROC="$(XSLTPROC)" \ 
    1517                PROJECT="@PACKAGE_NAME@" \ 
    16                 $(SHELL) "$(srcdir)/export-wiki.sh" "$(srcdir)" "$(builddir)/wiki.tmp" 
    17         mv "$(srcdir)/wiki.tmp" wiki.out 
     18                $(SHELL) "$(srcdir)/export-wiki.sh" "$(srcdir)" "wiki.tmp" 
     19        mv wiki.tmp wiki.out 
    1820 
    1921ChangeLog: 
    … …  
    3436 
    3537maintainer-clean-local: 
    36         rm -rf wiki.out wiki.tmp 
     38        rm -rf $(srcdir)/wiki.out wiki.out wiki.tmp 

  • trunk/etc/Makefile.am

    r3448 r3450  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22DISTCLEANFILES = opensc.conf  
    33 
    … …  
    1212sysconf_DATA=#required in order to create dir 
    1313install-exec-hook:      install-sysconfDATA opensc.conf 
    14         if [ -f $(DESTDIR)$(sysconfdir)/opensc.conf ]; then \ 
    15                 $(INSTALL_DATA) opensc.conf $(DESTDIR)$(sysconfdir)/opensc.conf.new; \ 
     14        if [ -f "$(DESTDIR)$(sysconfdir)/opensc.conf" ]; then \ 
     15                $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \ 
    1616        else \ 
    17                 $(INSTALL_DATA) opensc.conf $(DESTDIR)$(sysconfdir)/opensc.conf; \ 
     17                $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf"; \ 
    1818        fi 

  • trunk/src/Makefile.am

    r3414 r3450  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22EXTRA_DIST = Makefile.mak 
    33 

  • trunk/src/common/Makefile.am

    r3414 r3450  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22EXTRA_DIST = Makefile.mak 
    33 

  • trunk/src/include/Makefile.am

    r3414 r3450  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22EXTRA_DIST = Makefile.mak winconfig.h 
    33 

  • trunk/src/include/opensc/Makefile.am

    r3439 r3450  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22EXTRA_DIST = svnignore 
    33 

  • trunk/src/libopensc/Makefile.am

    r3449 r3450  
    11include $(top_srcdir)/win32/ltrc.inc 
    22 
    3 MAINTAINERCLEANFILES = Makefile.in 
     3MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    44CLEANFILES = versioninfo.rc 
    55EXTRA_DIST = Makefile.mak  

  • trunk/src/openssh/Makefile.am

    r3414 r3450  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33dist_noinst_DATA = README ask-for-pin.diff 

  • trunk/src/pkcs11/Makefile.am

    r3449 r3450  
    11include $(top_srcdir)/win32/ltrc.inc 
    22 
    3 MAINTAINERCLEANFILES = Makefile.in 
     3MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    44CLEANFILES = versioninfo.rc 
    55EXTRA_DIST = Makefile.mak 

  • trunk/src/pkcs15init/Makefile.am

    r3449 r3450  
    11include $(top_srcdir)/win32/ltrc.inc 
    22 
    3 MAINTAINERCLEANFILES = Makefile.in 
     3MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    44CLEANFILES = versioninfo.rc 
    55EXTRA_DIST = Makefile.mak 

  • trunk/src/scconf/Makefile.am

    r3449 r3450  
    11include $(top_srcdir)/win32/ltrc.inc 
    22 
    3 MAINTAINERCLEANFILES = Makefile.in 
     3MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    44DISTCLEANFILES = lex-parse.c 
    55CLEANFILES = versioninfo.rc 

  • trunk/src/signer/Makefile.am

    r3445 r3450  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33SUBDIRS = npinclude 

  • trunk/src/signer/npinclude/Makefile.am

    r3414 r3450  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33noinst_HEADERS = jri.h jri_md.h jritypes.h npapi.h npunix.c npupp.h 

  • trunk/src/tests/Makefile.am

    r3445 r3450  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22EXTRA_DIST = Makefile.mak 
    33 

  • trunk/src/tests/regression/Makefile.am

    r3414 r3450  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22 
    33dist_noinst_DATA = \ 
    … …  
    1010 
    1111# remove log files from regression tests 
    12 maintainer-clean-local: 
     12clean-local: 
    1313        -rm -rf out failed 

  • trunk/src/tools/Makefile.am

    r3449 r3450  
    11include $(top_srcdir)/win32/ltrc.inc 
    22 
    3 MAINTAINERCLEANFILES = Makefile.in 
     3MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    44CLEANFILES = versioninfo.rc 
    55EXTRA_DIST = Makefile.mak 

  • trunk/win32/Makefile.am

    r3414 r3450  
    1 MAINTAINERCLEANFILES = Makefile.in 
     1MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22EXTRA_DIST = Make.rules.mak Makefile.mak 
    33