Changeset 6c8ba3 in git

Timestamp:

Dec 5, 2013, 10:35:07 AM (10 years ago)

Author:

Mathias Schulze <mschulze@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

42f2ad0e44454045e95a5dea3298675e39832506

Parents:

b7fbc4c5dfe5f6b07cdd9cff21846d74c7fc121e

Message:

cleaned up debian/redhat files

Files:

• configure.ac (modified) (1 diff)
• desktop/Makefile.am (modified) (2 diffs)
• redhat/Makefile.am (modified) (1 diff)

configure.ac

@@ -227 +227 @@
 AC_CONFIG_FILES([IntegerProgramming/Makefile])
 
+AC_CONFIG_FILES([libsingular-config])
+
+AC_CONFIG_FILES([emacs/Makefile])
+
+AC_CONFIG_FILES([debian/Makefile])
+AC_CONFIG_FILES([redhat/Makefile])
 AC_CONFIG_FILES([redhat/singular.spec])
-# AC_CONFIG_FILES([desktop/Singular.desktop])
-# AC_CONFIG_FILES([desktop/Singular-manual.desktop])
-
-AC_CONFIG_FILES([libsingular-config])
-
-AC_CONFIG_FILES([redhat/Makefile])
-AC_CONFIG_FILES([emacs/Makefile])
-AC_CONFIG_FILES([debian/Makefile])
 AC_CONFIG_FILES([desktop/Makefile])
 

desktop/Makefile.am

@@ -6 +6 @@
 desktopdir = $(datadir)/applications
 desktop_DATA = Singular.desktop Singular-manual.desktop
+desktop_in = Singular.desktop.in Singular-manual.desktop.in
 
 substvars = sed \
@@ -15 +16 @@
         $(AM_V_GEN) $(substvars) $(abs_srcdir)/Singular.desktop.in > $@
 
-#       $(do_subst) < $(srcdir)/automake.in > automake
-
 Singular-manual.desktop: $(abs_srcdir)/Singular-manual.desktop.in
         $(AM_V_GEN) $(substvars) $(abs_srcdir)/Singular-manual.desktop.in > $@
 
-desktop_in = Singular.desktop.in Singular-manual.desktop.in
-
 EXTRA_DIST = $(icons_DATA) $(desktop_in)
 
-CLEANFILES = Singular.desktop Singular-manual.desktop
+CLEANFILES = $(desktop_DATA)

redhat/Makefile.am

@@ -3 +3 @@
 REDHAT = singular.spec
         
-EXTRA_DIST = singular.spec
+EXTRA_DIST = $(REDHAT)
+
 CLEANFILES = $(REDHAT)