diff options
author | marha <marha@users.sourceforge.net> | 2010-01-31 14:39:32 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-01-31 14:39:32 +0000 |
commit | fe6927d79e02d01cce20ecf56c8721fcadc2d278 (patch) | |
tree | 7c8ae5a40c3e2cd7825097c06c87f01ab85a24f0 /xorg-server/xkbdata.src/types/Makefile.in | |
parent | c035ec13d812ca609dd31590b86952f14394b5ec (diff) | |
download | vcxsrv-fe6927d79e02d01cce20ecf56c8721fcadc2d278.tar.gz vcxsrv-fe6927d79e02d01cce20ecf56c8721fcadc2d278.tar.bz2 vcxsrv-fe6927d79e02d01cce20ecf56c8721fcadc2d278.zip |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/xkbdata.src/types/Makefile.in')
-rw-r--r-- | xorg-server/xkbdata.src/types/Makefile.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/xkbdata.src/types/Makefile.in b/xorg-server/xkbdata.src/types/Makefile.in index d1ba36e04..78bcfee37 100644 --- a/xorg-server/xkbdata.src/types/Makefile.in +++ b/xorg-server/xkbdata.src/types/Makefile.in @@ -112,6 +112,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -173,7 +174,7 @@ typesdir = $(xkb_base)/types dist_types_DATA = \ basic cancel caps \ complete default extra \ -iso9995 level5 mousekeys numpad \ +iso9995 level5 mousekeys nokia numpad \ pc README dir_data = $(dist_types_DATA) @@ -192,9 +193,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu types/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign types/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu types/Makefile + $(AUTOMAKE) --foreign types/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ |